New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 564
revision-id: [email protected]
parent: [email protected]
committer: Matthieu Moy <[email protected]>
branch nick: moy
timestamp: Fri 2009-08-21 13:56:45 +0200
message:
xgit: (bugfix) uniquify file name to get relative path.
In case the repository is accessed via a relative link, the root will
be uniquified (i.e. physical path), and `file' will be the path
including the symlink name. Not uniquifying file messes up
`file-relative-name'. This broke `xgit-annotate' and `xgit-file-ediff'
which used xgit-revision-get-last-revision internally.
=== modified file 'lisp/xgit.el'
--- a/lisp/xgit.el 2009-08-21 09:00:56 +0000
+++ b/lisp/xgit.el 2009-08-21 11:56:45 +0000
@@ -696,7 +696,8 @@
(let* ((buffer (dvc-get-buffer-create 'xgit 'annotate))
(repo (xgit-git-dir-option dir))
(cmd "blame")
- (fname (file-relative-name file (xgit-tree-root dir)))
+ (fname (file-relative-name (dvc-uniquify-file-name file)
+ (xgit-tree-root dir)))
(args (list repo cmd "--" fname)))
(dvc-switch-to-buffer-maybe buffer)
(dvc-run-dvc-sync 'xgit args
@@ -874,7 +875,9 @@
file last-revision)
(let* ((xgit-rev (int-to-string (1- (nth 1 last-revision))))
(default-directory (car last-revision))
- (fname (file-relative-name file (xgit-tree-root))))
+ (fname (file-relative-name
+ (dvc-uniquify-file-name file)
+ (xgit-tree-root))))
(insert (dvc-run-dvc-sync
'xgit (list "cat-file" "blob"
(format "HEAD~%s:%s" xgit-rev fname))
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
