Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

When trying to check in from vc mode, I get the backtrace below.  Since
this is git, I'm not quite sure why it's querying bzr...

Debugger entered--Lisp error: (wrong-type-argument stringp nil)
  regexp-quote(nil)
  vc-bzr-status("/home/larsi/src/emacs/trunk/ChangeLog")
  vc-bzr-state("/home/larsi/src/emacs/trunk/ChangeLog")
  vc-bzr-registered("/home/larsi/src/emacs/trunk/ChangeLog")
  apply(vc-bzr-registered "/home/larsi/src/emacs/trunk/ChangeLog")
  vc-call-backend(Bzr registered "/home/larsi/src/emacs/trunk/ChangeLog")
  #[(b) "\302\b\303	#\205.\0\304	\305\b#\205.\0\306\307\310\"\207" [b file vc-call-backend registered vc-file-setprop vc-backend throw found t] 4](Bzr)
  mapc(#[(b) "\302\b\303	#\205.\0\304	\305\b#\205.\0\306\307\310\"\207" [b file vc-call-backend registered vc-file-setprop vc-backend throw found t] 4] (RCS CVS SVN SCCS SRC Bzr Git Hg Mtn Arch))
  vc-registered("/home/larsi/src/emacs/trunk/ChangeLog")
  vc-backend("/home/larsi/src/emacs/trunk/ChangeLog")
  vc-find-file-hook()
  run-hooks(find-file-hook)
  after-find-file(nil t)
  find-file-noselect-1(#<buffer ChangeLog> "~/src/emacs/trunk/ChangeLog" nil nil "~/src/emacs/trunk/ChangeLog" (3629080 2058))
  find-file-noselect("/home/larsi/src/emacs/trunk/ChangeLog")
  log-edit-changelog-entries("./")
  log-edit-insert-changelog-entries(("./"))
  log-edit-insert-changelog()
  run-hooks(log-edit-hook)
  log-edit(vc-finish-logentry t ((log-edit-listfun lambda nil (mapcar (quote file-relative-name) (quote ("/home/larsi/src/emacs/trunk/")))) (log-edit-diff-function . vc-diff) (log-edit-vc-backend . Git) (vc-log-fileset "/home/larsi/src/emacs/trunk/")) nil #[0 "\301\300\302\"\207" [Git vc-call-backend log-edit-mode] 3])
  vc-log-edit(("/home/larsi/src/emacs/trunk/") #[0 "\301\300\302\"\207" [Git vc-call-backend log-edit-mode] 3] Git)
  vc-start-logentry(("/home/larsi/src/emacs/trunk/") nil nil "Enter a change comment." "*vc-log*" #[0 "\301\300\302\"\207" [Git vc-call-backend log-edit-mode] 3] #[514 "\303\304\305.!\"\210\211\203.\0\306\307.\"\204.\0\310\262.\311C\312.\x19.\211\203[.\211@\313.!\203O.\314 \211\203K.\211@\315.!\211\203C.\316.\x02\"\203C.\211.\x06B\262.\210.A\266\202\202).\210\202T.\211.B\262.\x01A\266\202\202.\0\210\317\300\320.\x06.\x06$\210\321\322.\"\210\211\211\203\244.\211@\323\324\325\326.!8B\327BB\211\203\234.\211@\211@\211	>\204\224.\330\331.\n\".\x04A#\210\210.A\266\202\202|.\210.A\266\202\202k.\210)\266.\303\332\305.!\"\207" [Git vc-touched-properties vc-file-prop-obarray message "Checking in %s..." vc-delistify string-match "[^	\n ]" "*** empty log message ***" t nil file-directory-p buffer-list buffer-file-name string-prefix-p vc-call-backend checkin mapc vc-delete-automatic-version-backups (vc-state . up-to-date) vc-checkout-time 5 file-attributes ((vc-working-revision)) put intern "Checking in %s...done"] 13 "\n\n(fn FILES COMMENT)"] vc-checkin-hook Git)
  vc-checkin(("/home/larsi/src/emacs/trunk/") Git)
  vc-next-action(nil)
  funcall-interactively(vc-next-action nil)
  call-interactively(vc-next-action nil nil)
  command-execute(vc-next-action)


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> When trying to check in from vc mode, I get the backtrace below.  Since
> this is git, I'm not quite sure why it's querying bzr...

I seem to be getting this backtrace whenever I save or open a file.
Here's an example:

Debugger entered--Lisp error: (wrong-type-argument stringp nil)
  regexp-quote(nil)
  vc-bzr-status("/home/larsi/.newsrc")
  vc-bzr-state("/home/larsi/.newsrc")
  vc-bzr-registered("/home/larsi/.newsrc")
  apply(vc-bzr-registered "/home/larsi/.newsrc")
  vc-call-backend(Bzr registered "/home/larsi/.newsrc")
  #[(b) "\302\b\303	#\205.

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Eric S. Raymond]

Lars Magne Ingebrigtsen <larsi@gnus.org>:
> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
> 
> > When trying to check in from vc mode, I get the backtrace below.  Since
> > this is git, I'm not quite sure why it's querying bzr...
> 
> I seem to be getting this backtrace whenever I save or open a file.
> Here's an example:

I think I know why.  Very strange that it's not reproducing here.  I'll
push an attempted fix momentarily.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Eric S. Raymond]

Eric S. Raymond <esr@thyrsus.com>:
> > > When trying to check in from vc mode, I get the backtrace below.  Since
> > > this is git, I'm not quite sure why it's querying bzr...
> > 
> > I seem to be getting this backtrace whenever I save or open a file.
> > Here's an example:
> 
> I think I know why.  Very strange that it's not reproducing here.  I'll
> push an attempted fix momentarily.

Nope, my diagnosis was incorrect.  Still not reproducing here, but it
pronably has something to do with the fact that I've been rearranging
the guts of VC mode.  I recommend git pull followed by make bootstrap.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

"Eric S. Raymond" <esr@thyrsus.com> writes:

> Lars Magne Ingebrigtsen <larsi@gnus.org>:
>> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
>> 
>> > When trying to check in from vc mode, I get the backtrace below.  Since
>> > this is git, I'm not quite sure why it's querying bzr...
>> 
>> I seem to be getting this backtrace whenever I save or open a file.
>> Here's an example:
>
> I think I know why.  Very strange that it's not reproducing here.  I'll
> push an attempted fix momentarily.

edebugging this, the problem is here:

      (when (re-search-forward
             ;; bzr prints paths relative to the repository root.
             (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
                     (regexp-quote (vc-bzr-file-name-relative file))

where that function can return nil:

(defun vc-bzr-file-name-relative (filename)
  "Return file name FILENAME stripped of the initial Bzr repository path."
  (let* ((filename* (expand-file-name filename))
         (rootdir (vc-bzr-root filename*)))
    (when rootdir
         (file-relative-name filename* rootdir))))

And regexp-quote on nil doesn't work very well.

I don't know why this function is called at all, though.  Could it be
some local customisation I have that affects this?  I'll try with emacs -Q.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

"Eric S. Raymond" <esr@thyrsus.com> writes:

> Nope, my diagnosis was incorrect.  Still not reproducing here, but it
> pronably has something to do with the fact that I've been rearranging
> the guts of VC mode.  I recommend git pull followed by make bootstrap.

Yes, a "make bootstrap" fixed the issue.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> "Eric S. Raymond" <esr@thyrsus.com> writes:
>
>> Nope, my diagnosis was incorrect.  Still not reproducing here, but it
>> pronably has something to do with the fact that I've been rearranging
>> the guts of VC mode.  I recommend git pull followed by make bootstrap.
>
> Yes, a "make bootstrap" fixed the issue.

I spoke too soon:

Debugger entered--Lisp error: (wrong-type-argument stringp nil)
  regexp-quote(nil)
  vc-bzr-status("/home/larsi/src/emacs/trunk/lisp/net/eww.el")
  vc-bzr-state("/home/larsi/src/emacs/trunk/lisp/net/eww.el")
  vc-bzr-registered("/home/larsi/src/emacs/trunk/lisp/net/eww.el")
  apply(vc-bzr-registered "/home/larsi/src/emacs/trunk/lisp/net/eww.el")
  vc-call-backend(Bzr registered "/home/larsi/src/emacs/trunk/lisp/net/eww.el")
  #[(b) "\302\b\303	#\205.

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Eric S. Raymond]

Lars Magne Ingebrigtsen <larsi@gnus.org>:
> I spoke too soon:

Disturbing. Because I suspect this is my doing, but I cannot reproduce
it at all here - I've been trying.

I think what is happening is that your file visit is blowing up in the 
VC logic that tries to figure out what VCS owns the workfile.  My suspicion
falls on vc-bzr-registered.

Try changing vc-handled-backends to not include 'Bzr.  That might narrow
it down.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

"Eric S. Raymond" <esr@thyrsus.com> writes:

> Try changing vc-handled-backends to not include 'Bzr.  That might narrow
> it down.

Yes, if I remove Bzr from that list, everything works fine.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Eric S. Raymond]

Lars Magne Ingebrigtsen <larsi@gnus.org>:
> "Eric S. Raymond" <esr@thyrsus.com> writes:
> 
> > Try changing vc-handled-backends to not include 'Bzr.  That might narrow
> > it down.
> 
> Yes, if I remove Bzr from that list, everything works fine.

OK, now try restoring it and debugging on entry to the function
vc-bzr-registered. It''s almost certainly going wrong somewhere inside
there.

*Very* strange that I'm not seeing this.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Glenn Morris]

BTW, make check is broken.
http://hydra.nixos.org/build/17657568

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

"Eric S. Raymond" <esr@thyrsus.com> writes:

> OK, now try restoring it and debugging on entry to the function
> vc-bzr-registered. It''s almost certainly going wrong somewhere inside
> there.

With emacs -Q:

(require 'vc-bzr)
(vc-bzr-state "~/rms.jpg")

Debugger entered--Lisp error: (wrong-type-argument stringp nil)
  regexp-quote(nil)
  vc-bzr-status("~/rms.jpg")
  vc-bzr-state("~/rms.jpg")
  eval((vc-bzr-state "~/rms.jpg") nil)
  elisp--eval-last-sexp(nil)
  eval-last-sexp(nil)
  funcall-interactively(eval-last-sexp nil)
  call-interactively(eval-last-sexp nil nil)
  command-execute(eval-last-sexp)


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Eric S. Raymond]

Lars Magne Ingebrigtsen <larsi@gnus.org>:
> "Eric S. Raymond" <esr@thyrsus.com> writes:
> 
> > OK, now try restoring it and debugging on entry to the function
> > vc-bzr-registered. It''s almost certainly going wrong somewhere inside
> > there.
> 
> With emacs -Q:
> 
> (require 'vc-bzr)
> (vc-bzr-state "~/rms.jpg")
> 
> Debugger entered--Lisp error: (wrong-type-argument stringp nil)
>   regexp-quote(nil)
>   vc-bzr-status("~/rms.jpg")
>   vc-bzr-state("~/rms.jpg")
>   eval((vc-bzr-state "~/rms.jpg") nil)
>   elisp--eval-last-sexp(nil)
>   eval-last-sexp(nil)
>   funcall-interactively(eval-last-sexp nil)
>   call-interactively(eval-last-sexp nil nil)
>   command-execute(eval-last-sexp)

OK, I don't think -Q is going to make a difference here.

Looks like the call to bzr-state is the problem. Which is extremely odd
as I haven't modified that function. Can you bisect to determine which 
commit breaks things?  Going back to

       VC API simplification: remove ability to set initial revision.

is probably far enough.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

"Eric S. Raymond" <esr@thyrsus.com> writes:

> Looks like the call to bzr-state is the problem. Which is extremely odd
> as I haven't modified that function. Can you bisect to determine which 
> commit breaks things?  Going back to
>
>        VC API simplification: remove ability to set initial revision.
>
> is probably far enough.

Well, it worked late last night, so it's today's batch of changes.  :-)

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

This is the issue.

In vc-registered, we end up in this loop now:

      ;; There is no file name handler.
      ;; Try vc-BACKEND-registered for each handled BACKEND.
      (catch 'found
	(let ((backend (vc-file-getprop file 'vc-backend)))
	  (mapc
	   (lambda (b)
	     (and (vc-call-backend b 'registered file)
		  (vc-file-setprop file 'vc-backend b)
		  (throw 'found t)))
	   (if (or (not backend) (eq backend 'none))
	       vc-handled-backends
	     (cons backend vc-handled-backends))))
        ;; File is not registered.
        (vc-file-setprop file 'vc-backend 'none)
        nil)))))

where we call each backend for each VC backend.  This code used to look
like:

		 ;; vc-registered sets the vc-backend property
		 (t (if (vc-registered file-or-list)
			(vc-file-getprop file-or-list 'vc-backend)
		      nil)))))

So the problem is just that the bzr handler bugs out when you call it on
a file that isn't covered by bzr.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> This is the issue.

Err.  That was total nonsense -- I was edebugging two different
functions.  Please ignore.  :-)

Now I'll try again to trace this...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Lars Magne Ingebrigtsen]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
>
>> This is the issue.
>
> Err.  That was total nonsense -- I was edebugging two different
> functions.  Please ignore.  :-)
>
> Now I'll try again to trace this...

Ok.  This is the change that bugs out:

(defun vc-bzr-registered (file)
  "Return non-nil if FILE is registered with bzr."
  (let ((state (vc-bzr-state file)))
    (not (memq state '(nil unregistered ignored)))))

This is the old version:

(defun vc-bzr-registered (file)
  "Return non-nil if FILE is registered with bzr."
  (let ((state (vc-bzr-state-heuristic file)))
    (not (memq state '(nil unregistered ignored)))))

So `vc-bzr-state-heuristic' was safe to call on a non-bzr file, while
`vc-bzr-state' is not.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 2a81c5d 1/2: Confine vc-stay-local to CVS, because it was unusable in SVN.

[Eric S. Raymond]

Lars Magne Ingebrigtsen <larsi@gnus.org>:
> So `vc-bzr-state-heuristic' was safe to call on a non-bzr file, while
> `vc-bzr-state' is not.

Right you are.  I'l, restore that code.

Still can't understand why I didn't see the bug.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>