From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Masatake YAMATO Newsgroups: gmane.emacs.devel Subject: *-MIRROR and *-SOURCE in vc-arch.el Date: Sun, 17 Oct 2004 12:07:59 +0900 (JST) Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: <20041017.120759.112621295.jet@gyve.org> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1097982694 24240 80.91.229.6 (17 Oct 2004 03:11:34 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 17 Oct 2004 03:11:34 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 17 05:11:19 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CJ1S3-0005Tb-00 for ; Sun, 17 Oct 2004 05:11:19 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CJ1ZG-0005A3-CL for ged-emacs-devel@m.gmane.org; Sat, 16 Oct 2004 23:18:46 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CJ1Z8-00057q-HR for emacs-devel@gnu.org; Sat, 16 Oct 2004 23:18:38 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CJ1Z8-00057O-0F for emacs-devel@gnu.org; Sat, 16 Oct 2004 23:18:38 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CJ1Z7-00057G-Sw for emacs-devel@gnu.org; Sat, 16 Oct 2004 23:18:37 -0400 Original-Received: from [210.130.136.40] (helo=r-maa.spacetown.ne.jp) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CJ1RU-0002XY-1i for emacs-devel@gnu.org; Sat, 16 Oct 2004 23:10:44 -0400 Original-Received: from localhost (h219-110-075-017.catv01.itscom.jp [219.110.75.17]) by r-maa.spacetown.ne.jp (8.11.6) with ESMTP id i9H3Aa015052 for ; Sun, 17 Oct 2004 12:10:40 +0900 (JST) Original-To: emacs-devel@gnu.org X-Mailer: Mew version 4.0.62 on Emacs 21.3.50 / Mule 5.0 (SAKAKI) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:28496 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:28496 When I open a file which is in a directory retrieved by gnuarch(tla get) from local mirror archives or remote mirror archives of my local archives, I get an error: vc-arch-workfile-version: Opening directory: No such a file or a directory, /tmp/xtla-mirror/{arch}/xtla/xtla--jet/xtla--jet--0.2/jet@gyve.org--xtla-MIRROR/patch-log ("No such file or directory" is my translation. The original message is Japanese.) vc-arch-workfile-version doesn't handle mirror archives. In some case, tla uses -MIRROR or -SOURCE as suffix archive name: $ tla make-archive -H create a new archive directory usage: tla make-archive [options] [name] location ... With --mirror, label the new archive as a mirror of MASTER. Ordinary commits can not be made to a mirror archive, however the command "tla archive-mirror" can write to a mirror. Two special forms of this command are available: tla make-archive --mirror MASTER LOCATION is equivalent to: tla make-archive --mirror MASTER MASTER-MIRROR LOCATION ^^^^^^^ and thus "tla archive-mirror MASTER" will push changes from MASTER to the newly created mirror. tla make-archive --mirror-from MASTER-SOURCE LOCATION ^^^^^^^ is equivalent to: tla make-archive --mirror MASTER-SOURCE MASTER LOCATION and thus "tla archive-mirror MASTER" will pull changes from MASTER-SOURCE to the newly created mirror. 2004-10-17 Masatake YAMATO * vc-arch.el (vc-arch-workfile-version): Cut down mirror suffixes from the archive name. Index: lisp/vc-arch.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/vc-arch.el,v retrieving revision 1.12 diff -u -r1.12 vc-arch.el --- lisp/vc-arch.el 13 Sep 2004 20:39:59 -0000 1.12 +++ lisp/vc-arch.el 16 Oct 2004 16:29:40 -0000 @@ -282,6 +282,11 @@ (setq logdir (expand-file-name branch logdir)) (setq logdir (expand-file-name version logdir)) (setq logdir (expand-file-name archive logdir)) + (setq logdir (if (and (not (file-directory-p logdir)) + (or (string-match "\\(.+\\)-MIRROR$" logdir) + (string-match "\\(.+\\)-SOURCE$" logdir))) + (match-string 1 logdir) + logdir)) (setq logdir (expand-file-name "patch-log" logdir)) ;; Revision names go: base-0, patch-N, version-0, versionfix-N. (dolist (file (directory-files logdir))