Mercurial > emacs
comparison lisp/vc-bzr.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 328951014a28 |
children | 38312121c181 |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; vc-bzr.el --- VC backend for the bzr revision control system | 1 ;;; vc-bzr.el --- VC backend for the bzr revision control system |
2 | 2 |
3 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Dave Love <fx@gnu.org> | 5 ;; Author: Dave Love <fx@gnu.org> |
6 ;; Riccardo Murri <riccardo.murri@gmail.com> | 6 ;; Riccardo Murri <riccardo.murri@gmail.com> |
7 ;; Keywords: tools | 7 ;; Keywords: tools |
8 ;; Created: Sept 2006 | 8 ;; Created: Sept 2006 |
359 ;; If the lightweight checkout points to a | 359 ;; If the lightweight checkout points to a |
360 ;; location in the local file system, then we can | 360 ;; location in the local file system, then we can |
361 ;; look there for the version information. | 361 ;; look there for the version information. |
362 (when (re-search-forward "file://\\(.+\\)" nil t) | 362 (when (re-search-forward "file://\\(.+\\)" nil t) |
363 (let ((l-c-parent-dir (match-string 1))) | 363 (let ((l-c-parent-dir (match-string 1))) |
364 (when (and (memq system-type '(ms-dos windows-nt)) | |
365 (string-match-p "^/[[:alpha:]]:" l-c-parent-dir)) | |
366 ;;; The non-Windows code takes a shortcut by using the host/path | |
367 ;;; separator slash as the start of the absolute path. That | |
368 ;;; does not work on Windows, so we must remove it (bug#5345) | |
369 (setq l-c-parent-dir (substring l-c-parent-dir 1))) | |
364 (setq branch-format-file | 370 (setq branch-format-file |
365 (expand-file-name vc-bzr-admin-branch-format-file | 371 (expand-file-name vc-bzr-admin-branch-format-file |
366 l-c-parent-dir)) | 372 l-c-parent-dir)) |
367 (setq lastrev-file | 373 (setq lastrev-file |
368 (expand-file-name vc-bzr-admin-lastrev l-c-parent-dir)) | 374 (expand-file-name vc-bzr-admin-lastrev l-c-parent-dir)) |