##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard -
r8124:d883bfbd default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,210 +1,214
1 1 # monotone support for the convert extension
2 2
3 3 import os, re, time
4 4 from mercurial import util
5 5 from common import NoRepo, MissingTool, commit, converter_source, checktool
6 6 from common import commandline
7 7 from mercurial.i18n import _
8 8
9 9 class monotone_source(converter_source, commandline):
10 10 def __init__(self, ui, path=None, rev=None):
11 11 converter_source.__init__(self, ui, path, rev)
12 12 commandline.__init__(self, ui, 'mtn')
13 13
14 14 self.ui = ui
15 15 self.path = path
16 16
17 17 # regular expressions for parsing monotone output
18 18 space = r'\s*'
19 19 name = r'\s+"((?:\\"|[^"])*)"\s*'
20 20 value = name
21 21 revision = r'\s+\[(\w+)\]\s*'
22 22 lines = r'(?:.|\n)+'
23 23
24 24 self.dir_re = re.compile(space + "dir" + name)
25 25 self.file_re = re.compile(space + "file" + name + "content" + revision)
26 26 self.add_file_re = re.compile(space + "add_file" + name + "content" + revision)
27 27 self.patch_re = re.compile(space + "patch" + name + "from" + revision + "to" + revision)
28 28 self.rename_re = re.compile(space + "rename" + name + "to" + name)
29 29 self.delete_re = re.compile(space + "delete" + name)
30 30 self.tag_re = re.compile(space + "tag" + name + "revision" + revision)
31 31 self.cert_re = re.compile(lines + space + "name" + name + "value" + value)
32 32
33 33 attr = space + "file" + lines + space + "attr" + space
34 34 self.attr_execute_re = re.compile(attr + '"mtn:execute"' + space + '"true"')
35 35
36 36 # cached data
37 37 self.manifest_rev = None
38 38 self.manifest = None
39 39 self.files = None
40 40 self.dirs = None
41 41
42 42 norepo = NoRepo (_("%s does not look like a monotone repo") % path)
43 43 if not os.path.exists(path):
44 44 raise norepo
45 45
46 46 checktool('mtn', abort=False)
47 47
48 48 # test if there are any revisions
49 49 self.rev = None
50 50 try:
51 51 self.getheads()
52 52 except:
53 53 raise norepo
54 54 self.rev = rev
55 55
56 56 def mtnrun(self, *args, **kwargs):
57 57 kwargs['d'] = self.path
58 58 return self.run0('automate', *args, **kwargs)
59 59
60 60 def mtnloadmanifest(self, rev):
61 61 if self.manifest_rev == rev:
62 62 return
63 63 self.manifest = self.mtnrun("get_manifest_of", rev).split("\n\n")
64 64 self.manifest_rev = rev
65 65 self.files = {}
66 66 self.dirs = {}
67 67
68 68 for e in self.manifest:
69 69 m = self.file_re.match(e)
70 70 if m:
71 71 attr = ""
72 72 name = m.group(1)
73 73 node = m.group(2)
74 74 if self.attr_execute_re.match(e):
75 75 attr += "x"
76 76 self.files[name] = (node, attr)
77 77 m = self.dir_re.match(e)
78 78 if m:
79 79 self.dirs[m.group(1)] = True
80 80
81 81 def mtnisfile(self, name, rev):
82 82 # a non-file could be a directory or a deleted or renamed file
83 83 self.mtnloadmanifest(rev)
84 84 try:
85 85 self.files[name]
86 86 return True
87 87 except KeyError:
88 88 return False
89 89
90 90 def mtnisdir(self, name, rev):
91 91 self.mtnloadmanifest(rev)
92 92 try:
93 93 self.dirs[name]
94 94 return True
95 95 except KeyError:
96 96 return False
97 97
98 98 def mtngetcerts(self, rev):
99 99 certs = {"author":"<missing>", "date":"<missing>",
100 100 "changelog":"<missing>", "branch":"<missing>"}
101 101 cert_list = self.mtnrun("certs", rev).split('\n\n key "')
102 102 for e in cert_list:
103 103 m = self.cert_re.match(e)
104 104 if m:
105 105 name, value = m.groups()
106 106 value = value.replace(r'\"', '"')
107 107 value = value.replace(r'\\', '\\')
108 108 certs[name] = value
109 109 # Monotone may have subsecond dates: 2005-02-05T09:39:12.364306
110 110 certs["date"] = certs["date"].split('.')[0]
111 111 return certs
112 112
113 113 # implement the converter_source interface:
114 114
115 115 def getheads(self):
116 116 if not self.rev:
117 117 return self.mtnrun("leaves").splitlines()
118 118 else:
119 119 return [self.rev]
120 120
121 121 def getchanges(self, rev):
122 122 #revision = self.mtncmd("get_revision %s" % rev).split("\n\n")
123 123 revision = self.mtnrun("get_revision", rev).split("\n\n")
124 124 files = {}
125 125 ignoremove = {}
126 126 renameddirs = []
127 127 copies = {}
128 128 for e in revision:
129 129 m = self.add_file_re.match(e)
130 130 if m:
131 131 files[m.group(1)] = rev
132 132 ignoremove[m.group(1)] = rev
133 133 m = self.patch_re.match(e)
134 134 if m:
135 135 files[m.group(1)] = rev
136 136 # Delete/rename is handled later when the convert engine
137 137 # discovers an IOError exception from getfile,
138 138 # but only if we add the "from" file to the list of changes.
139 139 m = self.delete_re.match(e)
140 140 if m:
141 141 files[m.group(1)] = rev
142 142 m = self.rename_re.match(e)
143 143 if m:
144 144 toname = m.group(2)
145 145 fromname = m.group(1)
146 146 if self.mtnisfile(toname, rev):
147 147 ignoremove[toname] = 1
148 148 copies[toname] = fromname
149 149 files[toname] = rev
150 150 files[fromname] = rev
151 151 elif self.mtnisdir(toname, rev):
152 152 renameddirs.append((fromname, toname))
153 153
154 154 # Directory renames can be handled only once we have recorded
155 155 # all new files
156 156 for fromdir, todir in renameddirs:
157 157 renamed = {}
158 158 for tofile in self.files:
159 159 if tofile in ignoremove:
160 160 continue
161 161 if tofile.startswith(todir + '/'):
162 162 renamed[tofile] = fromdir + tofile[len(todir):]
163 # Avoid chained moves like:
164 # d1(/a) => d3/d1(/a)
165 # d2 => d3
166 ignoremove[tofile] = 1
163 167 for tofile, fromfile in renamed.items():
164 168 self.ui.debug (_("copying file in renamed dir from '%s' to '%s'")
165 169 % (fromfile, tofile), '\n')
166 170 files[tofile] = rev
167 171 copies[tofile] = fromfile
168 172 for fromfile in renamed.values():
169 173 files[fromfile] = rev
170 174
171 175 return (files.items(), copies)
172 176
173 177 def getmode(self, name, rev):
174 178 self.mtnloadmanifest(rev)
175 179 try:
176 180 node, attr = self.files[name]
177 181 return attr
178 182 except KeyError:
179 183 return ""
180 184
181 185 def getfile(self, name, rev):
182 186 if not self.mtnisfile(name, rev):
183 187 raise IOError() # file was deleted or renamed
184 188 try:
185 189 return self.mtnrun("get_file_of", name, r=rev)
186 190 except:
187 191 raise IOError() # file was deleted or renamed
188 192
189 193 def getcommit(self, rev):
190 194 certs = self.mtngetcerts(rev)
191 195 return commit(
192 196 author=certs["author"],
193 197 date=util.datestr(util.strdate(certs["date"], "%Y-%m-%dT%H:%M:%S")),
194 198 desc=certs["changelog"],
195 199 rev=rev,
196 200 parents=self.mtnrun("parents", rev).splitlines(),
197 201 branch=certs["branch"])
198 202
199 203 def gettags(self):
200 204 tags = {}
201 205 for e in self.mtnrun("tags").split("\n\n"):
202 206 m = self.tag_re.match(e)
203 207 if m:
204 208 tags[m.group(1)] = m.group(2)
205 209 return tags
206 210
207 211 def getchangedfiles(self, rev, i):
208 212 # This function is only needed to support --filemap
209 213 # ... and we don't support that
210 214 raise NotImplementedError()
Show file before | Show file after | Hide comments
@@ -1,122 +1,146
1 1 #!/bin/sh
2 2
3 3 "$TESTDIR/hghave" mtn || exit 80
4 4
5 5 # Monotone directory is called .monotone on *nix and monotone
6 6 # on Windows. Having a variable here ease test patching.
7 7 mtndir=.monotone
8 8 echo "[extensions]" >> $HGRCPATH
9 9 echo "convert=" >> $HGRCPATH
10 10 echo 'hgext.graphlog =' >> $HGRCPATH
11 11
12 12 HOME=`pwd`/do_not_use_HOME_mtn; export HOME
13 13 # Windows version of monotone home
14 14 APPDATA=$HOME; export APPDATA
15 15
16 16 echo % tedious monotone keys configuration
17 17 # The /dev/null redirection is necessary under Windows, or
18 18 # it complains about home directory permissions
19 19 mtn --quiet genkey test@selenic.com 1>/dev/null 2>&1 <<EOF
20 20 passphrase
21 21 passphrase
22 22 EOF
23 23 cat >> $HOME/$mtndir/monotonerc <<EOF
24 24 function get_passphrase(keypair_id)
25 25 return "passphrase"
26 26 end
27 27 EOF
28 28
29 29 echo % create monotone repository
30 30 mtn db init --db=repo.mtn
31 31 mtn --db=repo.mtn --branch=com.selenic.test setup workingdir
32 32 cd workingdir
33 33 echo a > a
34 34 mkdir dir
35 35 echo b > dir/b
36 36 echo d > dir/d
37 37 python -c 'file("bin", "wb").write("a\\x00b")'
38 38 echo c > c
39 39 mtn add a dir/b dir/d c bin
40 40 mtn ci -m initialize
41 41 echo % update monotone working directory
42 42 mtn mv a dir/a
43 43 echo a >> dir/a
44 44 echo b >> dir/b
45 45 mtn drop c
46 46 python -c 'file("bin", "wb").write("b\\x00c")'
47 47 mtn ci -m update1
48 48 cd ..
49 49
50 50 echo % convert once
51 51 hg convert -s mtn repo.mtn
52 52
53 53 cd workingdir
54 54 echo e > e
55 55 mtn add e
56 56 mtn drop dir/b
57 57 mtn mv bin bin2
58 58 mtn ci -m 'update2 "with" quotes'
59 59 echo '% test directory move'
60 60 mkdir -p dir1/subdir1
61 61 mkdir -p dir1/subdir2_other
62 62 echo file1 > dir1/subdir1/file1
63 63 echo file2 > dir1/subdir2_other/file1
64 64 mtn add dir1/subdir1/file1 dir1/subdir2_other/file1
65 65 mtn ci -m createdir1
66 66 mtn rename dir1/subdir1 dir1/subdir2
67 67 mtn ci -m movedir1
68 68 echo '% test subdirectory move'
69 69 mtn mv dir dir2
70 70 echo newfile > dir2/newfile
71 71 mtn drop dir2/d
72 72 mtn add dir2/newfile
73 73 mtn ci -m movedir
74 74 # Test directory removal with empty directory
75 75 mkdir dir2/dir
76 76 mkdir dir2/dir/subdir
77 77 echo f > dir2/dir/subdir/f
78 78 mkdir dir2/dir/emptydir
79 79 mtn add --quiet -R dir2/dir
80 80 mtn ci -m emptydir
81 81 mtn drop -R dir2/dir
82 82 mtn ci -m dropdirectory
83 83 echo '% test directory and file move'
84 84 mkdir -p dir3/d1
85 85 echo a > dir3/a
86 86 mtn add dir3/a dir3/d1
87 87 mtn ci -m dirfilemove
88 88 mtn mv dir3/a dir3/d1/a
89 89 mtn mv dir3/d1 dir3/d2
90 90 mtn ci -m dirfilemove2
91 echo '% test directory move into another directory move'
92 mkdir dir4
93 mkdir dir5
94 echo a > dir4/a
95 mtn add dir4/a dir5
96 mtn ci -m dirdirmove
97 mtn mv dir5 dir6
98 mtn mv dir4 dir6/dir4
99 mtn ci -m dirdirmove2
100 echo '% test diverging directory moves'
101 mkdir -p dir7/dir9/dir8
102 echo a > dir7/dir9/dir8/a
103 echo b > dir7/dir9/b
104 echo c > dir7/c
105 mtn add -R dir7
106 mtn ci -m divergentdirmove
107 mtn mv dir7 dir7-2
108 mtn mv dir7-2/dir9 dir9-2
109 mtn mv dir9-2/dir8 dir8-2
110 mtn ci -m divergentdirmove2
91 111 cd ..
92 112
93 113 echo % convert incrementally
94 114 hg convert -s mtn repo.mtn
95 115
96 116 glog()
97 117 {
98 118 hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
99 119 }
100 120
101 121 cd repo.mtn-hg
102 122 hg up -C
103 123 glog
104 124 echo % manifest
105 125 hg manifest
106 126 echo % contents
107 127 cat dir2/a
108 128 test -d dir2/dir && echo 'removed dir2/dir is still there!'
109 129
110 130 echo % file move
111 131 hg log -v -C -r 1 | grep copies
112 132 echo % check directory move
113 133 hg manifest -r 4
114 134 test -d dir1/subdir2 || echo 'new dir1/subdir2 does not exist!'
115 135 test -d dir1/subdir1 && echo 'renamed dir1/subdir1 is still there!'
116 136 hg log -v -C -r 4 | grep copies
117 137 echo % check file remove with directory move
118 138 hg manifest -r 5
119 139 echo % check file move with directory move
120 140 hg manifest -r 9
141 echo % check file directory directory move
142 hg manifest -r 11
143 echo % check divergent directory moves
144 hg manifest -r 13
121 145 exit 0
122 146
Show file before | Show file after | Hide comments
@@ -1,137 +1,199
1 1 % tedious monotone keys configuration
2 2 % create monotone repository
3 3 mtn: adding a to workspace manifest
4 4 mtn: adding bin to workspace manifest
5 5 mtn: adding c to workspace manifest
6 6 mtn: adding dir to workspace manifest
7 7 mtn: adding dir/b to workspace manifest
8 8 mtn: adding dir/d to workspace manifest
9 9 mtn: beginning commit on branch 'com.selenic.test'
10 10 mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90
11 11 % update monotone working directory
12 12 mtn: skipping dir, already accounted for in workspace
13 13 mtn: renaming a to dir/a in workspace manifest
14 14 mtn: dropping c from workspace manifest
15 15 mtn: beginning commit on branch 'com.selenic.test'
16 16 mtn: committed revision 51d0a982464573a2a2cf5ee2c9219c652aaebeff
17 17 % convert once
18 18 assuming destination repo.mtn-hg
19 19 initializing destination repo.mtn-hg repository
20 20 scanning source...
21 21 sorting...
22 22 converting...
23 23 1 initialize
24 24 0 update1
25 25 mtn: adding e to workspace manifest
26 26 mtn: dropping dir/b from workspace manifest
27 27 mtn: renaming bin to bin2 in workspace manifest
28 28 mtn: beginning commit on branch 'com.selenic.test'
29 29 mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da
30 30 % test directory move
31 31 mtn: adding dir1 to workspace manifest
32 32 mtn: adding dir1/subdir1 to workspace manifest
33 33 mtn: adding dir1/subdir1/file1 to workspace manifest
34 34 mtn: adding dir1/subdir2_other to workspace manifest
35 35 mtn: adding dir1/subdir2_other/file1 to workspace manifest
36 36 mtn: beginning commit on branch 'com.selenic.test'
37 37 mtn: committed revision a8d62bc04fee4d2936d28e98bbcc81686dd74306
38 38 mtn: skipping dir1, already accounted for in workspace
39 39 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest
40 40 mtn: beginning commit on branch 'com.selenic.test'
41 41 mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6
42 42 % test subdirectory move
43 43 mtn: renaming dir to dir2 in workspace manifest
44 44 mtn: dropping dir2/d from workspace manifest
45 45 mtn: adding dir2/newfile to workspace manifest
46 46 mtn: beginning commit on branch 'com.selenic.test'
47 47 mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c
48 48 mtn: beginning commit on branch 'com.selenic.test'
49 49 mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88
50 50 mtn: dropping dir2/dir/subdir/f from workspace manifest
51 51 mtn: dropping dir2/dir/subdir from workspace manifest
52 52 mtn: dropping dir2/dir/emptydir from workspace manifest
53 53 mtn: dropping dir2/dir from workspace manifest
54 54 mtn: beginning commit on branch 'com.selenic.test'
55 55 mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322
56 56 % test directory and file move
57 57 mtn: adding dir3 to workspace manifest
58 58 mtn: adding dir3/a to workspace manifest
59 59 mtn: adding dir3/d1 to workspace manifest
60 60 mtn: beginning commit on branch 'com.selenic.test'
61 61 mtn: committed revision 47b192f720faa622f48c68d1eb075b26d405aa8b
62 62 mtn: skipping dir3/d1, already accounted for in workspace
63 63 mtn: renaming dir3/a to dir3/d1/a in workspace manifest
64 64 mtn: skipping dir3, already accounted for in workspace
65 65 mtn: renaming dir3/d1 to dir3/d2 in workspace manifest
66 66 mtn: beginning commit on branch 'com.selenic.test'
67 67 mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632
68 % test directory move into another directory move
69 mtn: adding dir4 to workspace manifest
70 mtn: adding dir4/a to workspace manifest
71 mtn: adding dir5 to workspace manifest
72 mtn: beginning commit on branch 'com.selenic.test'
73 mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7
74 mtn: renaming dir5 to dir6 in workspace manifest
75 mtn: skipping dir6, already accounted for in workspace
76 mtn: renaming dir4 to dir6/dir4 in workspace manifest
77 mtn: beginning commit on branch 'com.selenic.test'
78 mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749
79 % test diverging directory moves
80 mtn: adding dir7 to workspace manifest
81 mtn: adding dir7/c to workspace manifest
82 mtn: adding dir7/dir9 to workspace manifest
83 mtn: adding dir7/dir9/b to workspace manifest
84 mtn: adding dir7/dir9/dir8 to workspace manifest
85 mtn: adding dir7/dir9/dir8/a to workspace manifest
86 mtn: beginning commit on branch 'com.selenic.test'
87 mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed
88 mtn: renaming dir7 to dir7-2 in workspace manifest
89 mtn: renaming dir7-2/dir9 to dir9-2 in workspace manifest
90 mtn: renaming dir9-2/dir8 to dir8-2 in workspace manifest
91 mtn: beginning commit on branch 'com.selenic.test'
92 mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6
68 93 % convert incrementally
69 94 assuming destination repo.mtn-hg
70 95 scanning source...
71 96 sorting...
72 97 converting...
73 7 update2 "with" quotes
74 6 createdir1
75 5 movedir1
76 4 movedir
77 3 emptydir
78 2 dropdirectory
79 1 dirfilemove
80 0 dirfilemove2
81 7 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 @ 9 "dirfilemove2" files: dir3/a dir3/d2/a
98 11 update2 "with" quotes
99 10 createdir1
100 9 movedir1
101 8 movedir
102 7 emptydir
103 6 dropdirectory
104 5 dirfilemove
105 4 dirfilemove2
106 3 dirdirmove
107 2 dirdirmove2
108 1 divergentdirmove
109 0 divergentdirmove2
110 11 files updated, 0 files merged, 0 files removed, 0 files unresolved
111 @ 13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b
112 |
113 o 12 "divergentdirmove" files: dir7/c dir7/dir9/b dir7/dir9/dir8/a
114 |
115 o 11 "dirdirmove2" files: dir4/a dir6/dir4/a
116 |
117 o 10 "dirdirmove" files: dir4/a
118 |
119 o 9 "dirfilemove2" files: dir3/a dir3/d2/a
83 120 |
84 121 o 8 "dirfilemove" files: dir3/a
85 122 |
86 123 o 7 "dropdirectory" files: dir2/dir/subdir/f
87 124 |
88 125 o 6 "emptydir" files: dir2/dir/subdir/f
89 126 |
90 127 o 5 "movedir" files: dir/a dir/d dir2/a dir2/newfile
91 128 |
92 129 o 4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1
93 130 |
94 131 o 3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1
95 132 |
96 133 o 2 "update2 "with" quotes" files: bin bin2 dir/b e
97 134 |
98 135 o 1 "update1" files: a bin c dir/a dir/b
99 136 |
100 137 o 0 "initialize" files: a bin c dir/b dir/d
101 138
102 139 % manifest
103 140 bin2
104 141 dir1/subdir2/file1
105 142 dir1/subdir2_other/file1
106 143 dir2/a
107 144 dir2/newfile
108 145 dir3/d2/a
146 dir6/dir4/a
147 dir7-2/c
148 dir8-2/a
149 dir9-2/b
109 150 e
110 151 % contents
111 152 a
112 153 a
113 154 % file move
114 155 copies: dir/a (a)
115 156 % check directory move
116 157 bin2
117 158 dir/a
118 159 dir/d
119 160 dir1/subdir2/file1
120 161 dir1/subdir2_other/file1
121 162 e
122 163 copies: dir1/subdir2/file1 (dir1/subdir1/file1)
123 164 % check file remove with directory move
124 165 bin2
125 166 dir1/subdir2/file1
126 167 dir1/subdir2_other/file1
127 168 dir2/a
128 169 dir2/newfile
129 170 e
130 171 % check file move with directory move
131 172 bin2
132 173 dir1/subdir2/file1
133 174 dir1/subdir2_other/file1
134 175 dir2/a
135 176 dir2/newfile
136 177 dir3/d2/a
137 178 e
179 % check file directory directory move
180 bin2
181 dir1/subdir2/file1
182 dir1/subdir2_other/file1
183 dir2/a
184 dir2/newfile
185 dir3/d2/a
186 dir6/dir4/a
187 e
188 % check divergent directory moves
189 bin2
190 dir1/subdir2/file1
191 dir1/subdir2_other/file1
192 dir2/a
193 dir2/newfile
194 dir3/d2/a
195 dir6/dir4/a
196 dir7-2/c
197 dir8-2/a
198 dir9-2/b
199 e
General Comments 0
You need to be logged in to leave comments. Login now