ViewVC logotype

Contents of /meta-cvs/F-255EFD9E99EDDE6614CF2CD912CA4E5C

Parent Directory Parent Directory | Revision Log Revision Log

Revision - (show annotations)
Sun Apr 13 06:22:43 2003 UTC (11 years ago) by kaz
Branch: mcvs-1-0-branch
CVS Tags: mcvs-1-0-6
Changes since +5 -1 lines
Revamped the synchronization logic. Synchronization now happens
in a specific direction.  For example, if we are doing a diff,
we just need to push changes from the tree to the MCVS directory,
not the other way around. Or: before an update or commit, we push from
the tree to MCVS, then after the update, in the other direction.

* code/update.lisp (mcvs-update): The before update is done
in the :left direction only, and the after update in the :right.

* code/move.lisp (mcvs-move): The just-in-case sync is done
in the :left direction only.

* code/link.lisp (mcvs-link): Likewise.

* code/remove.lisp (mcvs-remove): Likewise.

* code/add.lisp (mcvs-add): Get rid of mapping-synchronize call;
it's completely unnecessary, since the new files are not even
in the MAP-LOCAL, and the add logic explicitly links them into
the MCVS directory.

* code/generic.lisp (mcvs-generic): New keyword parameter,
need-sync-before. Before-synchronization done in :left direction,
after-synchronization in :right direction. Before-synchronization
is now not done by default; need-sync-before must be specified.
(mcvs-commit-wrapper): Specify before and after sync.
(mcvs-diff-wrapper, mcvs-status-wrapper,
mcvs-edit-wrapper): Explicitly specify before sync.
(mcvs-tag-wrapper, mcvs-annotate-wrapper): Implicitly specify no sync.
(mcvs-unedit-wrapper): Add before sync.

* code/sync.lisp (synchronize-files):  New key parameter :direction,
values can be :left, :right or :either. Default is :either.
If the value is :left or :right, then a sync is done only in that
direction, otherwise the value :no-sync is returned.
Behavior change: if the left file is missing (F- file in MCVS
directory) it is not re-created, but rather :no-sync is returned.
Also, if both files exist, have the same timestamp, and are
distinct objects, if the direction is :left or :right, then
the appropriate restart is automatically chosen. So this will
do the right thing on filesystems where link() is performed by
copying, without bothering the user with the error.

* code/mapping.lisp (mapping-synchronize): New :direction key
parameter, passed down to synchronize-filed. The new :no-sync
return value from synchronize-files is handled.
(mapping-update): Select the :right direction for synchronizing
moves, adds or rollbacks.
1 ;;; This source file is part of the Meta-CVS program,
2 ;;; which is distributed under the GNU license.
3 ;;; Copyright 2002 Kaz Kylheku
5 (require "system")
6 (require "mapping")
7 (require "chatter")
8 (require "restart")
9 (provide "move")
11 (defun source-check (expansion source)
12 (let ((real (abstract-to-real-path source)))
13 (when (path-prefix-equal *mcvs-dir* real)
14 (error "source path ~a is in a reserved Meta-CVS area." real))
15 (when (path-equal *this-dir* real)
16 (error "cannot move the sandbox root directory."))
17 (when (not expansion)
18 (if (exists real)
19 (error "~a is local, not versioned under Meta-CVS." real)
20 (error "~a does not exist." real)))))
22 (defun simple-rename (filemap source dest-file)
23 (let ((dir-expansion (mapping-extract-paths
24 (mapping-prefix-matches filemap source))))
25 (source-check dir-expansion source)
26 (mapping-rename-files filemap dir-expansion source dest-file)))
28 (defun simple-move-to-dir (filemap source dest-dir)
29 (let ((dir-expansion (mapping-extract-paths
30 (mapping-prefix-matches filemap source))))
31 (source-check dir-expansion source)
32 (multiple-value-bind (base dir) (basename source)
33 (if dir
34 (if (path-equal dest-dir *this-dir*)
35 (mapping-rename-files filemap dir-expansion source base)
36 (mapping-rename-files filemap dir-expansion dir dest-dir))
37 (mapping-rename-files filemap dir-expansion source
38 (canonicalize-path (path-cat dest-dir base)))))))
40 (defun move-guts (filemap sources destination)
41 (let* ((two-args (null (second sources)))
42 (destination-trailing-slash (string= (char destination
43 (1- (length destination)))
44 *path-sep*))
45 (dest-real-path (abstract-to-real-path destination))
46 (destination-file-object (no-existence-error (stat dest-real-path)))
47 (destination-file-exists (or (mapping-lookup filemap destination)
48 (and destination-file-object
49 (not (directory-p
50 destination-file-object)))))
51 (destination-dir-exists (and (not destination-file-exists)
52 (or (mapping-prefix-lookup filemap
53 destination)
54 (directory-p destination-file-object)
55 destination-trailing-slash))))
56 (if two-args
57 (if destination-dir-exists
58 (simple-move-to-dir filemap (first sources) destination)
59 (simple-rename filemap (first sources) destination))
60 (if destination-file-exists
61 (error "cannot move multiple to ~a." destination)
62 (let ((skipped-all t))
63 (dolist (source sources filemap)
64 (can-restart-here ("Skip ~a and continue renaming." source)
65 (setf filemap (simple-move-to-dir filemap source destination))
66 (setf skipped-all nil)))
67 (when skipped-all
68 (error "skipped all move sources."))
69 filemap)))))
71 (defun mcvs-move (args)
72 (when (< (length args) 2)
73 (error "requires at least two arguments."))
74 (in-sandbox-root-dir
75 (chatter-debug "Renaming.~%")
76 (let ((filemap (mapping-read *mcvs-map*))
77 (sources (mapcar #'real-to-abstract-path
78 (mapcar #'sandbox-translate-path (butlast args))))
79 (destination (canonicalize-path
80 (real-to-abstract-path
81 (sandbox-translate-path (first (last args)))))))
83 (let ((dest-real (abstract-to-real-path destination)))
84 (when (path-prefix-equal *mcvs-dir* dest-real)
85 (error "destination path ~a is in a reserved Meta-CVS area."
86 dest-real)))
88 (let ((edited-filemap (move-guts filemap sources destination))
89 (restore-map t))
90 (setf edited-filemap (sort edited-filemap
91 #'string< :key #'mapping-entry-id))
92 (when (equal-filemaps edited-filemap filemap)
93 (error "useless move of an object onto itself"))
95 ;; In case a move clobbers some object that has local edits,
96 ;; we need to synchronize it to the MCVS directory.
97 (chatter-debug "Synchronizing.~%")
98 (mapping-synchronize :direction :left)
100 (unwind-protect
101 (progn
102 (mapping-write edited-filemap *mcvs-map* :sort-map nil)
103 (chatter-debug "Updating file structure.~%")
104 (when (mapping-update)
105 (setf restore-map nil)))
106 (when restore-map
107 (chatter-terse "Undoing move.~%")
108 (mapping-write filemap *mcvs-map*)))))
109 (values)))
111 (defun mcvs-move-wrapper (cvs-options cvs-command-options mcvs-args)
112 (declare (ignore cvs-options cvs-command-options))
113 (mcvs-move mcvs-args))
115 (defconstant *move-help*
116 "Syntax:
118 mcvs move objects ... destination
120 Options:
122 none
124 Semantics:
126 The move command changes the names of versioned objects, resulting in a local
127 edit of the map. Like any other local change, a move is not published to the
128 repository until it is committed.
130 A move which affects the last component of a path is known as a rename; the
131 object appears to stay in the same directory, but its name changes. A move
132 affecting one or more of the other components appears to be a relocation.
133 Both of these are the same thing to the software.
135 The move command relocates only those files which are versioned in Meta-CVS;
136 it does not act upon local files. However, files can be moved into local
137 directories. Files can also be moved such that they clobber local files.
139 The behavior of the command very convenient, obeying the following rules:
141 - If the destination is an existing directory in the sandbox,
142 then the pathnames of the objects are renamed such that the objects are
143 relocated into that directory. If any of the source objects
144 are directories, then they are moved.
146 - If the destination is an existing file, then there must be exactly one
147 source argument; two or more objects cannot be moved to a non-directory
148 object. If that object is a local file, then the move produces an error,
149 which can be interactively resolved in favor of clobbering the file.
150 If the object is a Meta-CVS versioned file, then it is silently removed
151 as if by the remove command (which means that it is not lost, merely
152 unlinked from the map).
154 - If the destination does not exist, then it is deemed to be a directory
155 name if there are two or more source arguments, or to be a non-directory
156 name if there is one source argument. In the first case, the directory
157 is automatically created; there is no need for mkdir as with the Unix
158 mv command, so this is a nice convenience.
160 - If a move causes any directory to become empty, meaning that it contains
161 no local files, or Meta-CVS versioned files, that directory is removed.
162 This rule is applied recursively all the way up to the sandbox root: if
163 removing a directory causes its parent to become empty, that parent is
164 removed and so forth. Remember, empty directories have no representation
165 in Meta-CVS, and this is another way in which this turns out to be
166 a convenience. Directories that are not empty are not removed, even
167 if they contain only local files not known to the version control system.
169 - A directory can be moved into itself or to a subdirectory of itself.
170 The reader is invited to experiment to see how this works. The Unix
171 mv command disallows this, as does the underlying rename() system
172 call, so this is a third convenience.
174 - The root directory of a full or partial sandbox cannot be a source
175 argument.")

  ViewVC Help
Powered by ViewVC 1.1.5