headers
Phillip Lord | 21 Apr 2011 13:38
Picon
Picon
Favicon
Gravatar

Issue with mercurial backend


I'm getting a recurrent problem with the mercurial backend for DVC. 

If I do a "status" call, DVC runs mercurial as expected. However, the
use of "=" to get a diff fails, with a "no such directory" error. It's a
little limiting because this is I usually scan through all my files this
way when writting a change comment. 

I had a go at debugging this further, but I can't get my head around the
DVC code base! 

Any advice welcome. 

Phil

"Debugger entered--Lisp error: (file-error "Setting current directory" "no such file or directory" "trunk/themes/knowledgeblog/")
  call-process("diff" nil #<buffer *xhg-file-diff*<6>> nil "-u"
"-La/trunk/themes/knowledgeblog/home.php" "-Lb/trunk/themes/knowledgeblog/home.php"
"/tmp/DVC-file-diff-base25056Ao" "/tmp/DVC-file-diff-mod2505HLu")
  dvc-dvc-file-diff("trunk/themes/knowledgeblog/home.php" (xhg (last-revision
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/" 1)) (xhg (local-tree
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/")) t)
  apply(dvc-dvc-file-diff ("trunk/themes/knowledgeblog/home.php" (xhg (last-revision
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/" 1)) (xhg (local-tree
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/")) t))
  apply(apply dvc-dvc-file-diff ("trunk/themes/knowledgeblog/home.php" (xhg (last-revision
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/" 1)) (xhg (local-tree
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/")) t))
  dvc-apply("dvc-file-diff" ("trunk/themes/knowledgeblog/home.php" (xhg (last-revision
"/mnt/sdb1/home/phillord/src/ht/knowledgeblog/devel/" 1)) (xhg (local-tree
(Continue reading)

Permalink | Reply | 4 comments |
headers
Thierry Volpiatto | 21 Apr 2011 14:16
Picon
Gravatar

Re: Issue with mercurial backend

phillip.lord <at> newcastle.ac.uk (Phillip Lord) writes:

> I'm getting a recurrent problem with the mercurial backend for DVC. 
>
> If I do a "status" call, DVC runs mercurial as expected. However, the
What is a "status" call?
Is it M-x dvc-status (C-x V s)?
From where do launch dvc-status, one of the buffers of your project, the
dired buffer of your project?

> use of "=" to get a diff fails, with a "no such directory" error. It's a
> little limiting because this is I usually scan through all my files this
> way when writting a change comment. 
>
> I had a go at debugging this further, but I can't get my head around the
> DVC code base! 
>
> Any advice welcome. 
Can't reproduce here.
It seem you work on an USB key, are you sure your key is still mounted?

--

-- 
A+ Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997
Permalink | Reply | 3 comments |
headers
Phillip Lord | 21 Apr 2011 17:20
Picon
Picon
Favicon
Gravatar

Re: Issue with mercurial backend

Thierry Volpiatto <thierry.volpiatto <at> gmail.com> writes:

> phillip.lord <at> newcastle.ac.uk (Phillip Lord) writes:
>
>> I'm getting a recurrent problem with the mercurial backend for DVC. 
>>
>> If I do a "status" call, DVC runs mercurial as expected. However, the
> What is a "status" call?
> Is it M-x dvc-status (C-x V s)?

Yeah, sorry, not the clearest statement ever. 

>>From where do launch dvc-status, one of the buffers of your project, the
> dired buffer of your project?
>
>> use of "=" to get a diff fails, with a "no such directory" error. It's a
>> little limiting because this is I usually scan through all my files this
>> way when writting a change comment. 
>>
>> I had a go at debugging this further, but I can't get my head around the
>> DVC code base! 
>>
>> Any advice welcome. 
> Can't reproduce here.

Hmmm. Okay, well if I know that it *should* work, I can spend more time
trying to get it to do so. 

> It seem you work on an USB key, are you sure your key is still
> mounted?
(Continue reading)

Permalink | Reply | 2 comments |
headers
Stephen Leake | 22 Apr 2011 09:17
Favicon

Re: Issue with mercurial backend

phillip.lord <at> newcastle.ac.uk (Phillip Lord) writes:

> emacs -Q
>
> In *scratch* eval...
>
> (add-to-list 'load-path "~/emacs/packages/dvc/lisp")
> (require 'dvc-autoloads)
>
> success. 
>
> Navigate to ~/emacs/packages/dvc/lisp. Add a blank line to a one of the
> lisp files. 
>
> C-xVs (dvc-status) produces....
>
>
> modified:
>    modified      lisp/baz-dvc.el
> unknown:
>    unknown       texinfo/dvc.cp
>    unknown       texinfo/dvc.cps
>    unknown       texinfo/dvc.fn
>    unknown       texinfo/dvc.ky
>    unknown       texinfo/dvc.pdf
>    unknown       texinfo/dvc.pg
>    unknown       texinfo/dvc.toc
>    unknown       texinfo/dvc.tp
>    unknown       texinfo/dvc.vr
>
(Continue reading)

Permalink | Reply | 1 comment |
headers
Stephen Leake | 22 Apr 2011 09:35
Favicon

rev 556: lots of xmtn improvements, other minor fixes

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

lots of xmtn improvements, other minor fixes

  * lisp/xmtn-*: lots of xmtn improvements

  * lisp/Makefile.in (install): install xmtn-hooks.lua

  * texinfo/Makefile.in (alldeps): fix dvc-intro.texinfo for VPATH builds

  * lisp/dvc-log.el (dvc-dvc-log-edit): specify 'root' in call to dvc-get-buffer-create, to avoid
symlink issues.

  * texinfo/dvc-intro.texinfo (Top): add xmtn-sync-review in menu

  * lisp/dvc-fileinfo.el (dvc-fileinfo-next, -prev): use dvc-make-ewoc-next

  * lisp/dvc-fileinfo.el (dvc-fileinfo-prev): fix typo in fileinfo-prev

--

-- 
-- Stephe
Permalink | Reply | 0 comments |
headers
Stephen Leake | 22 Apr 2011 09:34
Favicon

rev 555: * lisp/dvc-buffers.el (dvc-get-buffer-create): ensure 'default-directory' is an absolute path

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

* lisp/dvc-buffers.el (dvc-get-buffer-create): ensure 'default-directory' is an absolute path

--

-- 
-- Stephe
Permalink | Reply | 0 comments |
headers
Stefan Reichör | 22 Apr 2011 23:07
Picon

[commit] rev 584: Merged from Stephen Leake: dvc-get-buffer-create bugfix, xmtn improvements

Committed revision 584 to http://bzr.xsteve.at/dvc/

Merged from Stephen Leake: dvc-get-buffer-create bugfix, xmtn improvements
Permalink | Reply | 0 comments |
headers
Phillip.Lord | 23 Apr 2011 11:52
Picon
Picon
Favicon

Re: Issue with mercurial backend

> phillip.lord <at> newcastle.ac.uk (Phillip Lord) writes:
>> = (dvc-diff-diff) produces ...
>>
>> Setting current directory: no such file or directory, lisp/
>
> I can reproduce this, on the current dvc from bzr head.
>
> As a work-around, you can use "e" instead of "=" (I just tried it). That
> runs ediff, which I find much easier to use than plain diff.

Ediff is better but slower. I generally check in often enough that diff is
fine.

>>
>> Debugger entered--Lisp error: (file-error "Setting current directory"
>> "no such file or directory" "lisp/")
>>   call-process("diff" nil #<buffer *bzr-file-diff*<4>> nil "-u"
>>   "-La/lisp/baz-dvc.el" "-Lb/lisp/baz-dvc.el"
>>   "/tmp/DVC-file-diff-base4210oIM" "/tmp/DVC-file-diff-mod42101SS")
>
> This appears to be a bug in dvc-diff.el dvc-dvc-file-diff .
> 'default-directory' for 'diff-buffer' is set to "lisp/", which is just
> wrong ('default-directory' must always be an absolute path).
>
> Actually, the bug is in dvc-buffers.el dvc-get-buffer-create:
>
>                           (let ((default-directory
>                                   (or (file-name-directory path)
>                                       default-directory)))
>                             (dvc-create-buffer name)))))
(Continue reading)

Permalink | Reply | 0 comments |

Gmane