2 Replicate (replay) changesets from one SVN repository to another.
5 from .. import base_version
, full_version
8 from .. import svnclient
9 from ..shell
import run_svn
,run_shell_command
10 from ..errors
import (ExternalCommandFailed
, UnsupportedSVNAction
, InternalError
, VerificationError
)
11 from parse
import HelpFormatter
12 from breakhandler
import BreakHandler
21 from datetime
import datetime
23 _valid_svn_actions
= "MARD" # The list of known SVN action abbr's, from "svn log"
25 # Module-level variables/parameters
26 source_url
= "" # URL to source path in source SVN repo, e.g. 'http://server/svn/source/trunk'
27 source_repos_url
= "" # URL to root of source SVN repo, e.g. 'http://server/svn/source'
28 source_base
= "" # Relative path of source_url in source SVN repo, e.g. '/trunk'
29 source_repos_uuid
= "" # UUID of source SVN repo
30 target_url
="" # URL to target path in target SVN repo, e.g. 'file:///svn/repo_target/trunk'
31 target_repos_url
= "" # URL to root of target SVN repo, e.g. 'http://server/svn/target'
32 target_base
= "" # Relative path of target_url in target SVN repo, e.g. '/trunk'
33 rev_map
= {} # The running mapping-table dictionary for source_url rev #'s -> target_url rev #'s
34 options
= None # optparser options
36 def parse_svn_commit_rev(output
):
38 Parse the revision number from the output of "svn commit".
40 output_lines
= output
.strip("\n").split("\n")
42 for line
in output_lines
:
43 if line
[0:19] == 'Committed revision ':
44 rev_num
= line
[19:].rstrip('.')
46 assert rev_num
is not None
49 def commit_from_svn_log_entry(log_entry
, commit_paths
=None, target_revprops
=None):
51 Given an SVN log entry and an optional list of changed paths, do an svn commit.
53 # TODO: Run optional external shell hook here, for doing pre-commit filtering
54 # Display the _wc_target "svn status" info if running in -vv (or higher) mode
55 if ui
.get_level() >= ui
.EXTRA
:
56 ui
.status(">> commit_from_svn_log_entry: Pre-commit _wc_target status:", level
=ui
.EXTRA
, color
='CYAN')
57 ui
.status(run_svn(["status"]), level
=ui
.EXTRA
, color
='CYAN')
58 # This will use the local timezone for displaying commit times
59 timestamp
= int(log_entry
['date'])
60 svn_date
= str(datetime
.fromtimestamp(timestamp
))
61 # Uncomment this one one if you prefer UTC commit times
62 #svn_date = "%d 0" % timestamp
63 args
= ["commit", "--force-log"]
64 message
= log_entry
['message']
66 message
+= "\nDate: " + svn_date
67 if options
.log_author
:
68 message
+= "\nAuthor: " + log_entry
['author']
69 args
+= ["-m", message
]
71 if log_entry
['revprops']:
72 # Carry forward any revprop's from the source revision
73 for v
in log_entry
['revprops']:
74 revprops
[v
['name']] = v
['value']
76 # Add any extra revprop's we want to set for the target repo commits
77 for v
in target_revprops
:
78 revprops
[v
['name']] = v
['value']
81 args
+= ["--with-revprop", "%s=%s" % (key
, str(revprops
[key
]))]
83 if len(commit_paths
)<100:
84 # If we don't have an excessive amount of individual changed paths, pass
85 # those to the "svn commit" command. Else, pass nothing so we commit at
86 # the root of the working-copy.
87 for c_path
in commit_paths
:
88 args
+= [svnclient
.safe_path(c_path
)]
90 if not options
.dry_run
:
91 # Use BreakHandler class to temporarily redirect SIGINT handler, so that
92 # "svn commit" + post-commit rev-prop updating is a quasi-atomic unit.
93 # If user presses Ctrl-C during this, wait until after this full action
94 # has finished raising the KeyboardInterrupt exception.
97 # Run the "svn commit" command, and screen-scrape the target_rev value (if any)
98 output
= run_svn(args
)
99 rev_num
= parse_svn_commit_rev(output
) if output
else None
100 if rev_num
is not None:
101 if options
.keep_date
:
102 run_svn(["propset", "--revprop", "-r", rev_num
, "svn:date", log_entry
['date_raw']])
103 if options
.keep_author
:
104 run_svn(["propset", "--revprop", "-r", rev_num
, "svn:author", log_entry
['author']])
105 ui
.status("Committed revision %s (source r%s).", rev_num
, log_entry
['revision'])
107 # Check if the user tried to press Ctrl-C
109 raise KeyboardInterrupt
112 def verify_commit(source_rev
, target_rev
, log_entry
=None):
114 Compare the ancestry/content/properties between source_url vs target_url
115 for a given revision.
118 # Gather the offsets in the source repo to check
121 # TODO: Need to make this ancestry aware
122 if options
.verify
== 1 and log_entry
is not None: # Changed only
123 ui
.status("Verifying source revision %s (only-changed)...", source_rev
, level
=ui
.VERBOSE
)
124 for d
in log_entry
['changed_paths']:
126 if not is_child_path(path
, source_base
):
129 d
['kind'] = svnclient
.get_kind(source_repos_url
, path
, source_rev
, d
['action'], log_entry
['changed_paths'])
130 assert (d
['kind'] == 'file') or (d
['kind'] == 'dir')
131 path_is_dir
= True if d
['kind'] == 'dir' else False
132 path_is_file
= True if d
['kind'] == 'file' else False
133 path_offset
= path
[len(source_base
):].strip("/")
134 if d
['action'] == 'D':
135 remove_paths
.append(path_offset
)
136 elif not path_offset
in check_paths
:
137 ui
.status("verify_commit: path [mode=changed]: kind=%s: %s", d
['kind'], path
, level
=ui
.DEBUG
, color
='YELLOW')
139 ui
.status(" "+"verify_commit [mode=changed]: check_paths.append('%s')", path_offset
, level
=ui
.DEBUG
, color
='GREEN')
140 check_paths
.append(path_offset
)
142 if not d
['action'] in 'AR':
144 child_paths
= run_svn(["list", "--recursive", "-r", source_rev
, svnclient
.safe_path(source_url
.rstrip("/")+"/"+path_offset
, source_rev
)])
145 child_paths
= child_paths
.strip("\n").split("\n")
146 for child_path
in child_paths
:
149 # Directories have a trailing slash in the "svn list" output
150 child_path_is_dir
= True if child_path
[-1] == "/" else False
151 child_path_offset
= child_path
.rstrip('/') if child_path_is_dir
else child_path
152 if not child_path_is_dir
:
154 working_path
= (path_offset
+"/" if path_offset
else "") + child_path_offset
155 if not working_path
in check_paths
:
156 ui
.status(" "+"verify_commit [mode=changed]: check_paths.append('%s'+'/'+'%s')", path_offset
, child_path_offset
, level
=ui
.DEBUG
, color
='GREEN')
157 check_paths
.append(working_path
)
158 if options
.verify
== 2: # All paths
159 ui
.status("Verifying source revision %s (all)...", source_rev
, level
=ui
.VERBOSE
)
160 child_paths
= run_svn(["list", "--recursive", "-r", source_rev
, svnclient
.safe_path(source_url
, source_rev
)])
161 child_paths
= child_paths
.strip("\n").split("\n")
162 for child_path
in child_paths
:
165 # Directories have a trailing slash in the "svn list" output
166 child_path_is_dir
= True if child_path
[-1] == "/" else False
167 child_path_offset
= child_path
.rstrip('/') if child_path_is_dir
else child_path
168 if not child_path_is_dir
:
170 ui
.status("verify_commit [mode=all]: check_paths.append('%s')", child_path_offset
, level
=ui
.DEBUG
, color
='GREEN')
171 check_paths
.append(child_path_offset
)
173 # If there were any paths deleted in the last revision (options.verify=1 mode),
174 # check that they were correctly deleted.
176 count_total
= len(remove_paths
)
178 for path_offset
in remove_paths
:
180 if in_svn(path_offset
):
181 ui
.status(" (%s/%s) Verify path: FAIL: %s", str(count
).rjust(len(str(count_total
))), count_total
, path_offset
, level
=ui
.EXTRA
, color
='RED')
182 ui
.status("VerificationError: Path removed in source rev r%s, but still exists in target WC: %s", source_rev
, path_offset
, color
='RED')
185 ui
.status(" (%s/%s) Verify remove: OK: %s", str(count
).rjust(len(str(count_total
))), count_total
, path_offset
, level
=ui
.EXTRA
)
187 # Compare each of the check_path entries between source vs. target
189 source_rev_first
= int(min(rev_map
, key
=rev_map
.get
)) or 1 # The first source_rev we replayed into target
190 ui
.status("verify_commit: source_rev_first:%s", source_rev_first
, level
=ui
.DEBUG
, color
='YELLOW')
191 count_total
= len(check_paths
)
193 for path_offset
in check_paths
:
196 ui
.status("...processed %s (%s of %s)..." % (count
, count
, count_total
), level
=ui
.VERBOSE
)
197 ui
.status("verify_commit: path_offset:%s", path_offset
, level
=ui
.DEBUG
, color
='YELLOW')
198 source_log_entries
= svnclient
.run_svn_log(svnclient
.safe_path(source_url
.rstrip("/")+"/"+path_offset
), source_rev
, 1, source_rev
-source_rev_first
+1)
199 target_log_entries
= svnclient
.run_svn_log(svnclient
.safe_path(target_url
.rstrip("/")+"/"+path_offset
), target_rev
, 1, target_rev
)
200 # Build a list of commits in source_log_entries which matches our
201 # target path_offset.
202 working_path
= source_base
+"/"+path_offset
204 for log_entry
in source_log_entries
:
205 source_rev_tmp
= log_entry
['revision']
206 if source_rev_tmp
< source_rev_first
:
207 # Only process source revisions which have been replayed into target
209 #ui.status(" [verify_commit] source_rev_tmp:%s, working_path:%s\n%s", source_rev_tmp, working_path, pp.pformat(log_entry), level=ui.DEBUG, color='MAGENTA')
210 changed_paths_temp
= []
211 for d
in log_entry
['changed_paths']:
213 # Match working_path or any parents
214 if is_child_path(working_path
, path
):
215 ui
.status(" verify_commit: changed_path: %s %s@%s (parent:%s)", d
['action'], path
, source_rev_tmp
, working_path
, level
=ui
.DEBUG
, color
='YELLOW')
216 changed_paths_temp
.append({'path': path, 'data': d}
)
217 assert changed_paths_temp
218 # Reverse-sort any matches, so that we start with the most-granular (deepest in the tree) path.
219 changed_paths
= sorted(changed_paths_temp
, key
=operator
.itemgetter('path'), reverse
=True)
220 # Find the action for our working_path in this revision. Use a loop to check in reverse order,
221 # so that if the target file/folder is "M" but has a parent folder with an "A" copy-from.
222 working_path_next
= working_path
224 for v
in changed_paths
:
229 if d
['action'] not in _valid_svn_actions
:
230 raise UnsupportedSVNAction("In SVN rev. %d: action '%s' not supported. Please report a bug!"
231 % (log_entry
['revision'], d
['action']))
232 if d
['action'] in 'AR' and d
['copyfrom_revision']:
233 # If we found a copy-from action for a parent path, adjust our
234 # working_path to follow the rename/copy-from, just like find_svn_ancestors().
235 working_path_next
= working_path
.replace(d
['path'], d
['copyfrom_path'])
238 if is_child_path(working_path
, source_base
):
239 # Only add source_rev's where the path changed in this revision was a child
240 # of source_base, so that we silently ignore any history that happened on
241 # non-source_base paths (e.g. ignore branch history if we're only replaying trunk).
244 if d
['action'] == 'M':
245 # For action="M", we need to throw out cases where the only change was to
246 # a property which we ignore, e.g. "svn:mergeinfo".
248 d
['kind'] = svnclient
.get_kind(source_repos_url
, working_path
, log_entry
['revision'], d
['action'], log_entry
['changed_paths'])
249 assert (d
['kind'] == 'file') or (d
['kind'] == 'dir')
250 if d
['kind'] == 'file':
251 # Check for file-content changes
252 # TODO: This should be made ancestor-aware, since the file won't always be at the same path in rev-1
253 sum1
= run_shell_command("svn cat -r %s '%s' | md5sum" % (source_rev_tmp
, source_repos_url
+working_path
+"@"+str(source_rev_tmp
)))
254 sum2
= run_shell_command("svn cat -r %s '%s' | md5sum" % (source_rev_tmp
-1, source_repos_url
+working_path_next
+"@"+str(source_rev_tmp
-1)))
255 is_diff
= True if sum1
<> sum2
else False
257 # Check for property changes
258 props1
= svnclient
.get_all_props(source_repos_url
+working_path
, source_rev_tmp
)
259 props2
= svnclient
.get_all_props(source_repos_url
+working_path_next
, source_rev_tmp
-1)
260 # Ignore changes to "svn:mergeinfo", since we don't copy that
261 if 'svn:mergeinfo' in props1
: del props1
['svn:mergeinfo']
262 if 'svn:mergeinfo' in props2
: del props2
['svn:mergeinfo']
264 if prop
not in props2
or \
265 props1
[prop
] != props2
[prop
]:
269 if prop
not in props1
or \
270 props1
[prop
] != props2
[prop
]:
274 ui
.status(" verify_commit: skip %s@%s", working_path
, source_rev_tmp
, level
=ui
.DEBUG
, color
='GREEN_B', bold
=True)
278 ui
.status(" verify_commit: source_revs.append(%s), working_path:%s", source_rev_tmp
, working_path
, level
=ui
.DEBUG
, color
='GREEN_B')
279 source_revs
.append({'path': working_path, 'revision': source_rev_tmp}
)
280 working_path
= working_path_next
281 # Build a list of all the target commits "svn log" returned
283 target_revs_rmndr
= []
284 for log_entry
in target_log_entries
:
285 target_rev_tmp
= log_entry
['revision']
286 ui
.status(" verify_commit: target_revs.append(%s)", target_rev_tmp
, level
=ui
.DEBUG
, color
='GREEN_B')
287 target_revs
.append(target_rev_tmp
)
288 target_revs_rmndr
.append(target_rev_tmp
)
289 # Compare the two lists
290 for d
in source_revs
:
291 working_path
= d
['path']
292 source_rev_tmp
= d
['revision']
293 target_rev_tmp
= get_rev_map(source_rev_tmp
, " ")
294 working_offset
= working_path
[len(source_base
):].strip("/")
295 sum1
= run_shell_command("svn cat -r %s '%s' | md5sum" % (source_rev_tmp
, source_repos_url
+working_path
+"@"+str(source_rev_tmp
)))
296 sum2
= run_shell_command("svn cat -r %s '%s' | md5sum" % (target_rev_tmp
, target_url
+"/"+working_offset
+"@"+str(target_rev_tmp
))) if target_rev_tmp
is not None else ""
297 #print "source@%s: %s" % (str(source_rev_tmp).ljust(6), sum1)
298 #print "target@%s: %s" % (str(target_rev_tmp).ljust(6), sum2)
299 ui
.status(" verify_commit: %s: source=%s target=%s", working_offset
, source_rev_tmp
, target_rev_tmp
, level
=ui
.DEBUG
, color
='GREEN')
300 if not target_rev_tmp
:
301 ui
.status(" (%s/%s) Verify path: FAIL: %s", str(count
).rjust(len(str(count_total
))), count_total
, path_offset
, level
=ui
.EXTRA
, color
='RED')
302 ui
.status("VerificationError: Unable to find corresponding target_rev for source_rev r%s in rev_map (path_offset='%s')", source_rev_tmp
, path_offset
, color
='RED')
305 if target_rev_tmp
not in target_revs
:
306 # If found a source_rev with no equivalent target_rev in target_revs,
307 # check if the only difference in source_rev vs. source_rev-1 is the
308 # removal/addition of a trailing newline char, since this seems to get
309 # stripped-out sometimes during the replay (via "svn export"?).
310 # Strip any trailing \r\n from file-content (http://stackoverflow.com/a/1656218/346778)
311 sum1
= run_shell_command("svn cat -r %s '%s' | perl -i -p0777we's/\\r\\n\z//' | md5sum" % (source_rev_tmp
, source_repos_url
+working_path
+"@"+str(source_rev_tmp
)))
312 sum2
= run_shell_command("svn cat -r %s '%s' | perl -i -p0777we's/\\r\\n\z//' | md5sum" % (source_rev_tmp
-1, source_repos_url
+working_path
+"@"+str(source_rev_tmp
-1)))
314 ui
.status(" (%s/%s) Verify path: FAIL: %s", str(count
).rjust(len(str(count_total
))), count_total
, path_offset
, level
=ui
.EXTRA
, color
='RED')
315 ui
.status("VerificationError: Found source_rev (r%s) with no corresponding target_rev: path_offset='%s'", source_rev_tmp
, path_offset
, color
='RED')
318 target_revs_rmndr
.remove(target_rev_tmp
)
319 if target_revs_rmndr
:
320 rmndr_list
= ", ".join(map(str, target_revs_rmndr
))
321 ui
.status(" (%s/%s) Verify path: FAIL: %s", str(count
).rjust(len(str(count_total
))), count_total
, path_offset
, level
=ui
.EXTRA
, color
='RED')
322 ui
.status("VerificationError: Found one or more *extra* target_revs: path_offset='%s', target_revs='%s'", path_offset
, rmndr_list
, color
='RED')
324 ui
.status(" (%s/%s) Verify path: OK: %s", str(count
).rjust(len(str(count_total
))), count_total
, path_offset
, level
=ui
.EXTRA
)
326 # Ensure there are no "extra" files in the target side
327 if options
.verify
== 2:
329 child_paths
= run_svn(["list", "--recursive", "-r", target_rev
, svnclient
.safe_path(target_url
, target_rev
)])
330 child_paths
= child_paths
.strip("\n").split("\n")
331 for child_path
in child_paths
:
334 # Directories have a trailing slash in the "svn list" output
335 child_path_is_dir
= True if child_path
[-1] == "/" else False
336 child_path_offset
= child_path
.rstrip('/') if child_path_is_dir
else child_path
337 if not child_path_is_dir
:
338 target_paths
.append(child_path_offset
)
340 for path_offset
in target_paths
:
341 if not path_offset
in check_paths
:
342 ui
.status("VerificationError: Path exists in target (@%s) but not source (@%s): %s", target_rev
, source_rev
, path_offset
, color
='RED')
344 for path_offset
in check_paths
:
345 if not path_offset
in target_paths
:
346 ui
.status("VerificationError: Path exists in source (@%s) but not target (@%s): %s", source_rev
, target_rev
, path_offset
, color
='RED')
350 raise VerificationError("Found %s verification errors" % (error_cnt
))
351 ui
.status("Verified revision %s (%s).", target_rev
, "all" if options
.verify
== 2 else "only-changed")
353 def full_svn_revert():
355 Do an "svn revert" and proactively remove any extra files in the working copy.
357 run_svn(["revert", "--recursive", "."])
358 output
= run_svn(["status"])
360 output_lines
= output
.strip("\n").split("\n")
361 for line
in output_lines
:
363 path
= line
[4:].strip(" ")
364 if os
.path
.isfile(path
):
366 if os
.path
.isdir(path
):
369 def gen_tracking_revprops(source_rev
):
371 Build an array of svn2svn-specific source-tracking revprops.
373 revprops
= [{'name':'svn2svn:source_uuid', 'value':source_repos_uuid}
,
374 {'name':'svn2svn:source_url', 'value':source_url}
,
375 {'name':'svn2svn:source_rev', 'value':source_rev}
]
378 def sync_svn_props(source_url
, source_rev
, path_offset
):
380 Carry-forward any unversioned properties from the source repo to the
383 source_props
= svnclient
.get_all_props(join_path(source_url
, path_offset
), source_rev
)
384 target_props
= svnclient
.get_all_props(path_offset
)
385 if 'svn:mergeinfo' in source_props
:
386 # Never carry-forward "svn:mergeinfo"
387 del source_props
['svn:mergeinfo']
388 for prop
in target_props
:
389 if prop
not in source_props
:
390 # Remove any properties which exist in target but not source
391 run_svn(["propdel", prop
, svnclient
.safe_path(path_offset
)])
392 for prop
in source_props
:
393 if prop
not in target_props
or \
394 source_props
[prop
] != target_props
[prop
]:
395 # Set/update any properties which exist in source but not target or
396 # whose value differs between source vs. target.
397 run_svn(["propset", prop
, source_props
[prop
], svnclient
.safe_path(path_offset
)])
399 def in_svn(p
, require_in_repo
=False, prefix
=""):
401 Check if a given file/folder is being tracked by Subversion.
402 Prior to SVN 1.6, we could "cheat" and look for the existence of ".svn" directories.
403 With SVN 1.7 and beyond, WC-NG means only a single top-level ".svn" at the root of the working-copy.
404 Use "svn status" to check the status of the file/folder.
406 entries
= svnclient
.get_svn_status(p
, no_recursive
=True)
410 if require_in_repo
and (d
['status'] == 'added' or d
['revision'] is None):
411 # If caller requires this path to be in the SVN repo, prevent returning True
412 # for paths that are only locally-added.
415 # Don't consider files tracked as deleted in the WC as under source-control.
416 # Consider files which are locally added/copied as under source-control.
417 ret
= True if not (d
['status'] == 'deleted') and (d
['type'] == 'normal' or d
['status'] == 'added' or d
['copied'] == 'true') else False
418 ui
.status(prefix
+ ">> in_svn('%s', require_in_repo=%s) --> %s", p
, str(require_in_repo
), str(ret
), level
=ui
.DEBUG
, color
='GREEN')
421 def is_child_path(path
, p_path
):
422 return True if (path
== p_path
) or (path
.startswith(p_path
+"/")) else False
424 def join_path(base
, child
):
426 return base
+"/"+child
if child
else base
428 def find_svn_ancestors(svn_repos_url
, start_path
, start_rev
, stop_base_path
=None, prefix
=""):
430 Given an initial starting path+rev, walk the SVN history backwards to inspect the
431 ancestry of that path, optionally seeing if it traces back to stop_base_path.
433 Build an array of copyfrom_path and copyfrom_revision pairs for each of the "svn copy"'s.
434 If we find a copyfrom_path which stop_base_path is a substring match of (e.g. we crawled
435 back to the initial branch-copy from trunk), then return the collection of ancestor
436 paths. Otherwise, copyfrom_path has no ancestry compared to stop_base_path.
438 This is useful when comparing "trunk" vs. "branch" paths, to handle cases where a
439 file/folder was renamed in a branch and then that branch was merged back to trunk.
441 'svn_repos_url' is the full URL to the root of the SVN repository,
442 e.g. 'file:///path/to/repo'
443 'start_path' is the path in the SVN repo to the source path to start checking
444 ancestry at, e.g. '/branches/fix1/projectA/file1.txt'.
445 'start_rev' is the revision to start walking the history of start_path backwards from.
446 'stop_base_path' is the path in the SVN repo to stop tracing ancestry once we've reached,
447 i.e. the target path we're trying to trace ancestry back to, e.g. '/trunk'.
449 ui
.status(prefix
+ ">> find_svn_ancestors: Start: (%s) start_path: %s stop_base_path: %s",
450 svn_repos_url
, start_path
+"@"+str(start_rev
), stop_base_path
, level
=ui
.DEBUG
, color
='YELLOW')
453 cur_path
= start_path
455 first_iter_done
= False
458 # Get the first "svn log" entry for cur_path (relative to @cur_rev)
459 ui
.status(prefix
+ ">> find_svn_ancestors: %s", svn_repos_url
+cur_path
+"@"+str(cur_rev
), level
=ui
.DEBUG
, color
='YELLOW')
460 log_entry
= svnclient
.get_first_svn_log_entry(svn_repos_url
+cur_path
, 1, cur_rev
)
462 ui
.status(prefix
+ ">> find_svn_ancestors: Done: no log_entry", level
=ui
.DEBUG
, color
='YELLOW')
465 # If we found a copy-from case which matches our stop_base_path, we're done.
466 # ...but only if we've at least tried to search for the first copy-from path.
467 if stop_base_path
is not None and first_iter_done
and is_child_path(cur_path
, stop_base_path
):
468 ui
.status(prefix
+ ">> find_svn_ancestors: Done: Found is_child_path(cur_path, stop_base_path) and first_iter_done=True", level
=ui
.DEBUG
, color
='YELLOW')
471 first_iter_done
= True
472 # Search for any actions on our target path (or parent paths).
473 changed_paths_temp
= []
474 for d
in log_entry
['changed_paths']:
476 if is_child_path(cur_path
, path
):
477 changed_paths_temp
.append({'path': path, 'data': d}
)
478 if not changed_paths_temp
:
479 # If no matches, then we've hit the end of the ancestry-chain.
480 ui
.status(prefix
+ ">> find_svn_ancestors: Done: No matching changed_paths", level
=ui
.DEBUG
, color
='YELLOW')
483 # Reverse-sort any matches, so that we start with the most-granular (deepest in the tree) path.
484 changed_paths
= sorted(changed_paths_temp
, key
=operator
.itemgetter('path'), reverse
=True)
485 # Find the action for our cur_path in this revision. Use a loop to check in reverse order,
486 # so that if the target file/folder is "M" but has a parent folder with an "A" copy-from
487 # then we still correctly match the deepest copy-from.
488 for v
in changed_paths
:
491 # Check action-type for this file
493 if action
not in _valid_svn_actions
:
494 raise UnsupportedSVNAction("In SVN rev. %d: action '%s' not supported. Please report a bug!"
495 % (log_entry
['revision'], action
))
496 ui
.status(prefix
+ "> %s %s%s", action
, path
,
497 (" (from %s)" % (d
['copyfrom_path']+"@"+str(d
['copyfrom_revision']))) if d
['copyfrom_path'] else "",
498 level
=ui
.DEBUG
, color
='YELLOW')
500 # If file/folder was deleted, ancestry-chain stops here
503 ui
.status(prefix
+ ">> find_svn_ancestors: Done: deleted", level
=ui
.DEBUG
, color
='YELLOW')
507 # If file/folder was added/replaced but not a copy, ancestry-chain stops here
508 if not d
['copyfrom_path']:
511 ui
.status(prefix
+ ">> find_svn_ancestors: Done: %s with no copyfrom_path",
512 "Added" if action
== "A" else "Replaced",
513 level
=ui
.DEBUG
, color
='YELLOW')
516 # Else, file/folder was added/replaced and is a copy, so add an entry to our ancestors list
517 # and keep checking for ancestors
518 ui
.status(prefix
+ ">> find_svn_ancestors: Found copy-from (action=%s): %s --> %s",
519 action
, path
, d
['copyfrom_path']+"@"+str(d
['copyfrom_revision']),
520 level
=ui
.DEBUG
, color
='YELLOW')
521 ancestors
.append({'path': cur_path
, 'revision': log_entry
['revision'],
522 'copyfrom_path': cur_path
.replace(d
['path'], d
['copyfrom_path']), 'copyfrom_rev': d
['copyfrom_revision']})
523 cur_path
= cur_path
.replace(d
['path'], d
['copyfrom_path'])
524 cur_rev
= d
['copyfrom_revision']
525 # Follow the copy and keep on searching
527 if stop_base_path
and no_ancestry
:
528 # If we're tracing back ancestry to a specific target stop_base_path and
529 # the ancestry-chain stopped before we reached stop_base_path, then return
530 # nothing since there is no ancestry chaining back to that target.
533 if ui
.get_level() >= ui
.DEBUG
:
535 for idx
in range(len(ancestors
)):
537 max_len
= max(max_len
, len(d
['path']+"@"+str(d
['revision'])))
538 ui
.status(prefix
+ ">> find_svn_ancestors: Found parent ancestors:", level
=ui
.DEBUG
, color
='YELLOW_B')
539 for idx
in range(len(ancestors
)):
541 ui
.status(prefix
+ " [%s] %s --> %s", idx
,
542 str(d
['path']+"@"+str(d
['revision'])).ljust(max_len
),
543 str(d
['copyfrom_path']+"@"+str(d
['copyfrom_rev'])),
544 level
=ui
.DEBUG
, color
='YELLOW')
546 ui
.status(prefix
+ ">> find_svn_ancestors: No ancestor-chain found: %s",
547 svn_repos_url
+start_path
+"@"+str(start_rev
), level
=ui
.DEBUG
, color
='YELLOW')
550 def get_rev_map(source_rev
, prefix
):
552 Find the equivalent rev # in the target repo for the given rev # from the source repo.
554 ui
.status(prefix
+ ">> get_rev_map(%s)", source_rev
, level
=ui
.DEBUG
, color
='GREEN')
555 # Find the highest entry less-than-or-equal-to source_rev
556 for rev
in range(int(source_rev
), 0, -1):
557 in_rev_map
= True if rev
in rev_map
else False
558 ui
.status(prefix
+ ">> get_rev_map: rev=%s in_rev_map=%s", rev
, str(in_rev_map
), level
=ui
.DEBUG
, color
='BLACK_B')
560 return int(rev_map
[rev
])
561 # Else, we fell off the bottom of the rev_map. Ruh-roh...
564 def set_rev_map(source_rev
, target_rev
):
565 #ui.status(">> set_rev_map: source_rev=%s target_rev=%s", source_rev, target_rev, level=ui.DEBUG, color='GREEN')
567 rev_map
[int(source_rev
)]=int(target_rev
)
569 def build_rev_map(target_url
, target_end_rev
, source_info
):
571 Check for any already-replayed history from source_url (source_info) and
572 build the mapping-table of source_rev -> target_rev.
576 ui
.status("Rebuilding target_rev -> source_rev rev_map...", level
=ui
.VERBOSE
)
578 it_log_entries
= svnclient
.iter_svn_log_entries(target_url
, 1, target_end_rev
, get_changed_paths
=False, get_revprops
=True)
579 for log_entry
in it_log_entries
:
580 if log_entry
['revprops']:
582 for v
in log_entry
['revprops']:
583 if v
['name'].startswith('svn2svn:'):
584 revprops
[v
['name']] = v
['value']
586 revprops
['svn2svn:source_uuid'] == source_info
['repos_uuid'] and \
587 revprops
['svn2svn:source_url'] == source_info
['url']:
588 source_rev
= revprops
['svn2svn:source_rev']
589 target_rev
= log_entry
['revision']
590 set_rev_map(source_rev
, target_rev
)
592 if proc_count
% 500 == 0:
593 ui
.status("...processed %s (%s of %s)..." % (proc_count
, target_rev
, target_end_rev
), level
=ui
.VERBOSE
)
595 def get_svn_dirlist(svn_path
, rev_number
=None):
597 Get a list of all the child contents (recusive) of the given folder path.
600 if rev_number
is not None:
601 args
+= ["-r", rev_number
]
602 args
+= [svnclient
.safe_path(svn_path
, rev_number
)]
603 paths
= run_svn(args
, no_fail
=True)
604 paths
= paths
.strip("\n").split("\n") if len(paths
)>1 else []
607 def path_in_list(paths
, path
):
609 if is_child_path(path
, p
):
613 def add_path(paths
, path
):
614 if not path_in_list(paths
, path
):
617 def in_ancestors(ancestors
, ancestor
):
619 for idx
in range(len(ancestors
)-1, 0, -1):
620 if int(ancestors
[idx
]['revision']) > ancestor
['revision']:
621 match
= is_child_path(ancestor
['path'], ancestors
[idx
]['path'])
625 def do_svn_add(source_url
, path_offset
, source_rev
, source_ancestors
, \
626 parent_copyfrom_path
="", parent_copyfrom_rev
="", \
627 export_paths
={}, is_dir
= False, skip_paths
=[], prefix
= ""):
629 Given the add'd source path, replay the "svn add/copy" commands to correctly
630 track renames across copy-from's.
632 For example, consider a sequence of events like this:
633 1. svn copy /trunk /branches/fix1
634 2. (Make some changes on /branches/fix1)
635 3. svn mv /branches/fix1/Proj1 /branches/fix1/Proj2 " Rename folder
636 4. svn mv /branches/fix1/Proj2/file1.txt /branches/fix1/Proj2/file2.txt " Rename file inside renamed folder
637 5. svn co /trunk && svn merge /branches/fix1
638 After the merge and commit, "svn log -v" with show a delete of /trunk/Proj1
639 and and add of /trunk/Proj2 copy-from /branches/fix1/Proj2. If we were just
640 to do a straight "svn export+add" based on the /branches/fix1/Proj2 folder,
641 we'd lose the logical history that Proj2/file2.txt is really a descendant
644 'path_offset' is the offset from source_base to the file to check ancestry for,
645 e.g. 'projectA/file1.txt'. path = source_repos_url + source_base + path_offset.
646 'source_rev' is the revision ("svn log") that we're processing from the source repo.
647 'parent_copyfrom_path' and 'parent_copyfrom_rev' is the copy-from path of the parent
648 directory, when being called recursively by do_svn_add_dir().
649 'export_paths' is the list of path_offset's that we've deferred running "svn export" on.
650 'is_dir' is whether path_offset is a directory (rather than a file).
652 source_base
= source_url
[len(source_repos_url
):] # e.g. '/trunk'
653 ui
.status(prefix
+ ">> do_svn_add: %s %s", join_path(source_base
, path_offset
)+"@"+str(source_rev
),
654 " (parent-copyfrom: "+parent_copyfrom_path
+"@"+str(parent_copyfrom_rev
)+")" if parent_copyfrom_path
else "",
655 level
=ui
.DEBUG
, color
='GREEN')
656 # Check if the given path has ancestors which chain back to the current source_base
657 found_ancestor
= False
658 ancestors
= find_svn_ancestors(source_repos_url
, join_path(source_base
, path_offset
), source_rev
, stop_base_path
=source_base
, prefix
=prefix
+" ")
659 ancestor
= ancestors
[len(ancestors
)-1] if ancestors
else None # Choose the eldest ancestor, i.e. where we reached stop_base_path=source_base
660 if ancestor
and not in_ancestors(source_ancestors
, ancestor
):
662 copyfrom_path
= ancestor
['copyfrom_path'] if ancestor
else ""
663 copyfrom_rev
= ancestor
['copyfrom_rev'] if ancestor
else ""
665 # The copy-from path has ancestry back to source_url.
666 ui
.status(prefix
+ ">> do_svn_add: Check copy-from: Found parent: %s", copyfrom_path
+"@"+str(copyfrom_rev
),
667 level
=ui
.DEBUG
, color
='GREEN', bold
=True)
668 found_ancestor
= True
669 # Map the copyfrom_rev (source repo) to the equivalent target repo rev #. This can
670 # return None in the case where copyfrom_rev is *before* our source_start_rev.
671 tgt_rev
= get_rev_map(copyfrom_rev
, prefix
+" ")
672 ui
.status(prefix
+ ">> do_svn_add: get_rev_map: %s (source) -> %s (target)", copyfrom_rev
, tgt_rev
, level
=ui
.DEBUG
, color
='GREEN')
674 ui
.status(prefix
+ ">> do_svn_add: Check copy-from: No ancestor chain found.", level
=ui
.DEBUG
, color
='GREEN')
675 found_ancestor
= False
676 if found_ancestor
and tgt_rev
:
677 # Check if this path_offset in the target WC already has this ancestry, in which
678 # case there's no need to run the "svn copy" (again).
679 path_in_svn
= in_svn(path_offset
, prefix
=prefix
+" ")
680 log_entry
= svnclient
.get_last_svn_log_entry(path_offset
, 1, 'HEAD', get_changed_paths
=False) if in_svn(path_offset
, require_in_repo
=True, prefix
=prefix
+" ") else []
681 if (not log_entry
or (log_entry
['revision'] != tgt_rev
)):
682 copyfrom_offset
= copyfrom_path
[len(source_base
):].strip('/')
683 ui
.status(prefix
+ ">> do_svn_add: svn_copy: Copy-from: %s", copyfrom_path
+"@"+str(copyfrom_rev
), level
=ui
.DEBUG
, color
='GREEN')
684 ui
.status(prefix
+ " copyfrom: %s", copyfrom_path
+"@"+str(copyfrom_rev
), level
=ui
.DEBUG
, color
='GREEN')
685 ui
.status(prefix
+ " p_copyfrom: %s", parent_copyfrom_path
+"@"+str(parent_copyfrom_rev
) if parent_copyfrom_path
else "", level
=ui
.DEBUG
, color
='GREEN')
687 ((parent_copyfrom_path
and is_child_path(copyfrom_path
, parent_copyfrom_path
)) and \
688 (parent_copyfrom_rev
and copyfrom_rev
== parent_copyfrom_rev
)):
689 # When being called recursively, if this child entry has the same ancestor as the
690 # the parent, then no need to try to run another "svn copy".
691 ui
.status(prefix
+ ">> do_svn_add: svn_copy: Same ancestry as parent: %s",
692 parent_copyfrom_path
+"@"+str(parent_copyfrom_rev
),level
=ui
.DEBUG
, color
='GREEN')
695 # Copy this path from the equivalent path+rev in the target repo, to create the
696 # equivalent history.
697 if parent_copyfrom_path
:
698 # If we have a parent copy-from path, we mis-match that so display a status
699 # message describing the action we're mimic'ing. If path_in_svn, then this
700 # is logically a "replace" rather than an "add".
701 ui
.status(" %s %s (from %s)", ('R' if path_in_svn
else 'A'), join_path(source_base
, path_offset
), ancestors
[0]['copyfrom_path']+"@"+str(copyfrom_rev
), level
=ui
.VERBOSE
)
703 # If local file is already under version-control, then this is a replace.
704 ui
.status(prefix
+ ">> do_svn_add: pre-copy: local path already exists: %s", path_offset
, level
=ui
.DEBUG
, color
='GREEN')
705 run_svn(["update", svnclient
.safe_path(path_offset
)])
706 run_svn(["remove", "--force", svnclient
.safe_path(path_offset
)])
707 run_svn(["copy", "-r", tgt_rev
, svnclient
.safe_path(join_path(target_url
, copyfrom_offset
), tgt_rev
), svnclient
.safe_path(path_offset
)])
709 # Export the final verison of all files in this folder.
710 add_path(export_paths
, path_offset
)
712 # Export the final verison of this file.
713 run_svn(["export", "--force", "-r", source_rev
,
714 svnclient
.safe_path(source_repos_url
+join_path(source_base
, path_offset
), source_rev
), svnclient
.safe_path(path_offset
)])
715 if options
.keep_prop
:
716 sync_svn_props(source_url
, source_rev
, path_offset
)
718 ui
.status(prefix
+ ">> do_svn_add: Skipped 'svn copy': %s", path_offset
, level
=ui
.DEBUG
, color
='GREEN')
720 # Else, either this copy-from path has no ancestry back to source_url OR copyfrom_rev comes
721 # before our initial source_start_rev (i.e. tgt_rev == None), so can't do a "svn copy".
722 # Create (parent) directory if needed.
723 # TODO: This is (nearly) a duplicate of code in process_svn_log_entry(). Should this be
724 # split-out to a shared tag?
725 p_path
= path_offset
if is_dir
else os
.path
.dirname(path_offset
).strip() or None
726 if p_path
and not os
.path
.exists(p_path
):
727 run_svn(["mkdir", svnclient
.safe_path(p_path
)])
728 if not in_svn(path_offset
, prefix
=prefix
+" "):
730 # Export the final verison of all files in this folder.
731 add_path(export_paths
, path_offset
)
733 # Export the final verison of this file. We *need* to do this before running
734 # the "svn add", even if we end-up re-exporting this file again via export_paths.
735 run_svn(["export", "--force", "-r", source_rev
,
736 svnclient
.safe_path(source_repos_url
+join_path(source_base
, path_offset
), source_rev
), svnclient
.safe_path(path_offset
)])
737 # If not already under version-control, then "svn add" this file/folder.
738 run_svn(["add", "--parents", svnclient
.safe_path(path_offset
)])
739 if options
.keep_prop
:
740 sync_svn_props(source_url
, source_rev
, path_offset
)
742 # For any folders that we process, process any child contents, so that we correctly
743 # replay copies/replaces/etc.
744 do_svn_add_dir(source_url
, path_offset
, source_rev
, source_ancestors
,
745 copyfrom_path
, copyfrom_rev
, export_paths
, skip_paths
, prefix
+" ")
747 def do_svn_add_dir(source_url
, path_offset
, source_rev
, source_ancestors
, \
748 parent_copyfrom_path
, parent_copyfrom_rev
, \
749 export_paths
, skip_paths
, prefix
=""):
750 source_base
= source_url
[len(source_repos_url
):] # e.g. '/trunk'
751 # Get the directory contents, to compare between the local WC (target_url) vs. the remote repo (source_url)
752 # TODO: paths_local won't include add'd paths because "svn ls" lists the contents of the
753 # associated remote repo folder. (Is this a problem?)
754 paths_local
= get_svn_dirlist(path_offset
)
755 paths_remote
= get_svn_dirlist(join_path(source_url
, path_offset
), source_rev
)
756 ui
.status(prefix
+ ">> do_svn_add_dir: paths_local: %s", str(paths_local
), level
=ui
.DEBUG
, color
='GREEN')
757 ui
.status(prefix
+ ">> do_svn_add_dir: paths_remote: %s", str(paths_remote
), level
=ui
.DEBUG
, color
='GREEN')
758 # Update files/folders which exist in remote but not local
759 for path
in paths_remote
:
760 path_is_dir
= True if path
[-1] == "/" else False
761 working_path
= join_path(path_offset
, (path
.rstrip('/') if path_is_dir
else path
)).lstrip('/')
762 #print "working_path:%s = path_offset:%s + path:%s" % (working_path, path_offset, path)
763 if not working_path
in skip_paths
:
764 do_svn_add(source_url
, working_path
, source_rev
, source_ancestors
,
765 parent_copyfrom_path
, parent_copyfrom_rev
,
766 export_paths
, path_is_dir
, skip_paths
, prefix
+" ")
767 # Remove files/folders which exist in local but not remote
768 for path
in paths_local
:
769 if not path
in paths_remote
:
770 path_is_dir
= True if path
[-1] == "/" else False
771 working_path
= join_path(path_offset
, (path
.rstrip('/') if path_is_dir
else path
)).lstrip('/')
772 ui
.status(" %s %s", 'D', join_path(source_base
, working_path
), level
=ui
.VERBOSE
)
773 run_svn(["update", svnclient
.safe_path(working_path
)])
774 run_svn(["remove", "--force", svnclient
.safe_path(working_path
)])
775 # TODO: Does this handle deleted folders too? Wouldn't want to have a case
776 # where we only delete all files from folder but leave orphaned folder around.
778 def process_svn_log_entry(log_entry
, ancestors
, commit_paths
, prefix
= ""):
780 Process SVN changes from the given log entry. Build an array (commit_paths)
781 of the paths in the working-copy that were changed, i.e. the paths which
782 we'll pass to "svn commit".
785 source_rev
= log_entry
['revision']
786 source_url
= log_entry
['url']
787 source_base
= source_url
[len(source_repos_url
):] # e.g. '/trunk'
788 ui
.status(prefix
+ ">> process_svn_log_entry: %s", source_url
+"@"+str(source_rev
), level
=ui
.DEBUG
, color
='GREEN')
789 for d
in log_entry
['changed_paths']:
790 # Get the full path for this changed_path
791 # e.g. '/branches/bug123/projectA/file1.txt'
793 if not is_child_path(path
, source_base
):
794 # Ignore changed files that are not part of this subdir
795 ui
.status(prefix
+ ">> process_svn_log_entry: Unrelated path: %s (base: %s)", path
, source_base
, level
=ui
.DEBUG
, color
='GREEN')
797 if d
['kind'] == "" or d
['kind'] == 'none':
798 # The "kind" value was introduced in SVN 1.6, and "svn log --xml" won't return a "kind"
799 # value for commits made on a pre-1.6 repo, even if the server is now running 1.6.
800 # We need to use other methods to fetch the node-kind for these cases.
801 d
['kind'] = svnclient
.get_kind(source_repos_url
, path
, source_rev
, d
['action'], log_entry
['changed_paths'])
802 assert (d
['kind'] == 'file') or (d
['kind'] == 'dir')
803 path_is_dir
= True if d
['kind'] == 'dir' else False
804 path_is_file
= True if d
['kind'] == 'file' else False
805 # Calculate the offset (based on source_base) for this changed_path
806 # e.g. 'projectA/file1.txt'
807 # (path = source_base + "/" + path_offset)
808 path_offset
= path
[len(source_base
):].strip("/")
809 # Get the action for this path
811 if action
not in _valid_svn_actions
:
812 raise UnsupportedSVNAction("In SVN rev. %d: action '%s' not supported. Please report a bug!"
813 % (source_rev
, action
))
814 ui
.status(" %s %s%s", action
, d
['path'],
815 (" (from %s)" % (d
['copyfrom_path']+"@"+str(d
['copyfrom_revision']))) if d
['copyfrom_path'] else "",
818 # Try to be efficient and keep track of an explicit list of paths in the
819 # working copy that changed. If we commit from the root of the working copy,
820 # then SVN needs to crawl the entire working copy looking for pending changes.
821 commit_paths
.append(path_offset
)
823 # Special-handling for replace's
825 # If file was "replaced" (deleted then re-added, all in same revision),
826 # then we need to run the "svn rm" first, then change action='A'. This
827 # lets the normal code below handle re-"svn add"'ing the files. This
828 # should replicate the "replace".
829 if path_offset
and in_svn(path_offset
):
830 # Target path might not be under version-control yet, e.g. parent "add"
831 # was a copy-from a branch which had no ancestry back to trunk, and each
832 # child folder under that parent folder is a "replace" action on the final
833 # merge to trunk. Since the child folders will be in skip_paths, do_svn_add
834 # wouldn't have created them while processing the parent "add" path.
836 # Need to "svn update" before "svn remove" in case child contents are at
837 # a higher rev than the (parent) path_offset.
838 run_svn(["update", svnclient
.safe_path(path_offset
)])
839 run_svn(["remove", "--force", svnclient
.safe_path(path_offset
)])
842 # Handle all the various action-types
843 # (Handle "add" first, for "svn copy/move" support)
845 # Determine where to export from.
847 # Handle cases where this "add" was a copy from another URL in the source repo
848 if d
['copyfrom_revision']:
849 copyfrom_path
= d
['copyfrom_path']
850 copyfrom_rev
= d
['copyfrom_revision']
852 for tmp_d
in log_entry
['changed_paths']:
853 tmp_path
= tmp_d
['path']
854 if is_child_path(tmp_path
, path
) and tmp_d
['action'] in 'ARD':
855 # Build list of child entries which are also in the changed_paths list,
856 # so that do_svn_add() can skip processing these entries when recursing
857 # since we'll end-up processing them later. Don't include action="M" paths
858 # in this list because it's non-conclusive: it could just mean that the
859 # file was modified *after* the copy-from, so we still want do_svn_add()
860 # to re-create the correct ancestry.
861 tmp_path_offset
= tmp_path
[len(source_base
):].strip("/")
862 skip_paths
.append(tmp_path_offset
)
863 do_svn_add(source_url
, path_offset
, source_rev
, ancestors
, "", "", export_paths
, path_is_dir
, skip_paths
, prefix
+" ")
864 # Else just "svn export" the files from the source repo and "svn add" them.
866 # Create (parent) directory if needed
867 p_path
= path_offset
if path_is_dir
else os
.path
.dirname(path_offset
).strip() or None
868 if p_path
and not os
.path
.exists(p_path
):
869 run_svn(["mkdir", svnclient
.safe_path(p_path
)])
870 # Export the entire added tree.
872 # For directories, defer the (recurisve) "svn export". Might have a
873 # situation in a branch merge where the entry in the svn-log is a
874 # non-copy-from'd "add" but there are child contents (that we haven't
875 # gotten to yet in log_entry) that are copy-from's. When we try do
876 # the "svn copy" later on in do_svn_add() for those copy-from'd paths,
877 # having pre-existing (svn-add'd) contents creates some trouble.
878 # Instead, just create the stub folders ("svn mkdir" above) and defer
879 # exporting the final file-state until the end.
880 add_path(export_paths
, path_offset
)
882 # Export the final verison of this file. We *need* to do this before running
883 # the "svn add", even if we end-up re-exporting this file again via export_paths.
884 run_svn(["export", "--force", "-r", source_rev
,
885 svnclient
.safe_path(join_path(source_url
, path_offset
), source_rev
), svnclient
.safe_path(path_offset
)])
886 if not in_svn(path_offset
, prefix
=prefix
+" "):
887 # Need to use in_svn here to handle cases where client committed the parent
888 # folder and each indiv sub-folder.
889 run_svn(["add", "--parents", svnclient
.safe_path(path_offset
)])
890 if options
.keep_prop
:
891 sync_svn_props(source_url
, source_rev
, path_offset
)
895 # For dirs, need to "svn update" before "svn remove" because the final
896 # "svn commit" will fail if the parent (path_offset) is at a lower rev
897 # than any of the child contents. This needs to be a recursive update.
898 run_svn(["update", svnclient
.safe_path(path_offset
)])
899 run_svn(["remove", "--force", svnclient
.safe_path(path_offset
)])
903 run_svn(["export", "--force", "-N" , "-r", source_rev
,
904 svnclient
.safe_path(join_path(source_url
, path_offset
), source_rev
), svnclient
.safe_path(path_offset
)])
906 # For dirs, need to "svn update" before export/prop-sync because the
907 # final "svn commit" will fail if the parent is at a lower rev than
908 # child contents. Just need to update the rev-state of the dir (d['path']),
909 # don't need to recursively update all child contents.
910 # (??? is this the right reason?)
911 run_svn(["update", "-N", svnclient
.safe_path(path_offset
)])
912 if options
.keep_prop
:
913 sync_svn_props(source_url
, source_rev
, path_offset
)
916 raise InternalError("Internal Error: process_svn_log_entry: Unhandled 'action' value: '%s'"
919 # Export the final version of all add'd paths from source_url
921 for path_offset
in export_paths
:
922 run_svn(["export", "--force", "-r", source_rev
,
923 svnclient
.safe_path(join_path(source_url
, path_offset
), source_rev
), svnclient
.safe_path(path_offset
)])
925 def keep_revnum(source_rev
, target_rev_last
, wc_target_tmp
):
927 Add "padding" target revisions as needed to keep source and target
928 revision #'s identical.
931 if int(source_rev
) <= int(target_rev_last
):
932 raise InternalError("keep-revnum mode is enabled, "
933 "but source revision (r%s) is less-than-or-equal last target revision (r%s)" % \
934 (source_rev
, target_rev_last
))
935 if int(target_rev_last
) < int(source_rev
)-1:
936 # Add "padding" target revisions to keep source and target rev #'s identical
937 if os
.path
.exists(wc_target_tmp
):
938 shell
.rmtree(wc_target_tmp
)
939 run_svn(["checkout", "-r", "HEAD", "--depth=empty", svnclient
.safe_path(target_repos_url
, "HEAD"), svnclient
.safe_path(wc_target_tmp
)])
940 for rev_num
in range(int(target_rev_last
)+1, int(source_rev
)):
941 run_svn(["propset", "svn2svn:keep-revnum", rev_num
, svnclient
.safe_path(wc_target_tmp
)])
942 # Prevent Ctrl-C's during this inner part, so we'll always display
943 # the "Commit revision ..." message if we ran a "svn commit".
945 output
= run_svn(["commit", "-m", "", svnclient
.safe_path(wc_target_tmp
)])
946 rev_num_tmp
= parse_svn_commit_rev(output
) if output
else None
947 assert rev_num
== rev_num_tmp
948 ui
.status("Committed revision %s (keep-revnum).", rev_num
)
950 # Check if the user tried to press Ctrl-C
952 raise KeyboardInterrupt
953 target_rev_last
= rev_num
954 shell
.rmtree(wc_target_tmp
)
955 return target_rev_last
957 def disp_svn_log_summary(log_entry
):
958 ui
.status("------------------------------------------------------------------------", level
=ui
.VERBOSE
)
959 ui
.status("r%s | %s | %s",
960 log_entry
['revision'],
962 str(datetime
.fromtimestamp(int(log_entry
['date'])).isoformat(' ')), level
=ui
.VERBOSE
)
963 ui
.status(log_entry
['message'], level
=ui
.VERBOSE
)
966 global source_url
, target_url
, rev_map
967 source_url
= urllib
.quote(args
.pop(0).rstrip("/"),"/:") # e.g. 'http://server/svn/source/trunk'
968 target_url
= urllib
.quote(args
.pop(0).rstrip("/"),"/:") # e.g. 'file:///svn/target/trunk'
969 ui
.status("options: %s", str(options
), level
=ui
.DEBUG
, color
='GREEN')
971 # Make sure that both the source and target URL's are valid
972 source_info
= svnclient
.get_svn_info(source_url
)
973 assert is_child_path(source_url
, source_info
['repos_url'])
974 target_info
= svnclient
.get_svn_info(target_url
)
975 assert is_child_path(target_url
, target_info
['repos_url'])
978 global source_repos_url
,source_base
,source_repos_uuid
979 source_repos_url
= source_info
['repos_url'] # e.g. 'http://server/svn/source'
980 source_base
= source_url
[len(source_repos_url
):] # e.g. '/trunk'
981 source_repos_uuid
= source_info
['repos_uuid']
982 global target_repos_url
,target_base
983 target_repos_url
= target_info
['repos_url'] # e.g. 'http://server/svn/target'
984 target_base
= target_url
[len(target_repos_url
):] # e.g. '/trunk'
986 # Init start and end revision
988 source_start_rev
= svnclient
.get_svn_rev(source_repos_url
, options
.rev_start
if options
.rev_start
else 1)
989 except ExternalCommandFailed
:
990 print "Error: Invalid start source revision value: %s" % (options
.rev_start
)
993 source_end_rev
= svnclient
.get_svn_rev(source_repos_url
, options
.rev_end
if options
.rev_end
else "HEAD")
994 except ExternalCommandFailed
:
995 print "Error: Invalid end source revision value: %s" % (options
.rev_end
)
997 ui
.status("Using source revision range %s:%s", source_start_rev
, source_end_rev
, level
=ui
.VERBOSE
)
999 # TODO: If options.keep_date, should we try doing a "svn propset" on an *existing* revision
1000 # as a sanity check, so we check if the pre-revprop-change hook script is correctly setup
1001 # before doing first replay-commit?
1003 target_rev_last
= target_info
['revision'] # Last revision # in the target repo
1004 wc_target
= os
.path
.abspath('_wc_target')
1005 wc_target_tmp
= os
.path
.abspath('_wc_target_tmp')
1006 num_entries_proc
= 0
1011 # Check out a working copy of target_url if needed
1012 wc_exists
= os
.path
.exists(wc_target
)
1013 if wc_exists
and not options
.cont_from_break
:
1014 shell
.rmtree(wc_target
)
1017 ui
.status("Checking-out _wc_target...", level
=ui
.VERBOSE
)
1018 svnclient
.svn_checkout(target_url
, wc_target
)
1021 # If using an existing WC, make sure it's clean ("svn revert")
1022 ui
.status("Cleaning-up _wc_target...", level
=ui
.VERBOSE
)
1023 run_svn(["cleanup"])
1026 if not options
.cont_from_break
:
1027 # Warn user if trying to start (non-continue) into a non-empty target path
1028 if not options
.force_nocont
:
1029 top_paths
= run_svn(["list", "-r", "HEAD", svnclient
.safe_path(target_url
, "HEAD")])
1030 if len(top_paths
)>0:
1031 print "Error: Trying to replay (non-continue-mode) into a non-empty target_url location. " \
1032 "Use --force if you're sure this is what you want."
1034 # Get the first log entry at/after source_start_rev, which is where
1035 # we'll do the initial import from.
1036 source_ancestors
= find_svn_ancestors(source_repos_url
, source_base
, source_end_rev
, prefix
=" ")
1037 it_log_start
= svnclient
.iter_svn_log_entries(source_url
, source_start_rev
, source_end_rev
, get_changed_paths
=False, ancestors
=source_ancestors
)
1038 source_start_log
= None
1039 for log_entry
in it_log_start
:
1040 # Pick the first entry. Need to use a "for ..." loop since we're using an iterator.
1041 source_start_log
= log_entry
1043 if not source_start_log
:
1044 raise InternalError("Unable to find any matching revisions between %s:%s in source_url: %s" % \
1045 (source_start_rev
, source_end_rev
, source_url
))
1047 # This is the revision we will start from for source_url
1048 source_start_rev
= int(source_start_log
['revision'])
1049 ui
.status("Starting at source revision %s.", source_start_rev
, level
=ui
.VERBOSE
)
1050 ui
.status("", level
=ui
.VERBOSE
)
1051 if options
.keep_revnum
and source_rev
> target_rev_last
:
1052 target_rev_last
= keep_revnum(source_rev
, target_rev_last
, wc_target_tmp
)
1054 # For the initial commit to the target URL, export all the contents from
1055 # the source URL at the start-revision.
1056 disp_svn_log_summary(svnclient
.get_one_svn_log_entry(source_repos_url
, source_start_rev
, source_start_rev
))
1057 # Export and add file-contents from source_url@source_start_rev
1058 source_start_url
= source_url
if not source_ancestors
else source_repos_url
+source_ancestors
[len(source_ancestors
)-1]['copyfrom_path']
1059 top_paths
= run_svn(["list", "-r", source_start_rev
, svnclient
.safe_path(source_start_url
, source_start_rev
)])
1060 top_paths
= top_paths
.strip("\n").split("\n")
1061 for path
in top_paths
:
1062 # For each top-level file/folder...
1065 # Directories have a trailing slash in the "svn list" output
1066 path_is_dir
= True if path
[-1] == "/" else False
1067 path_offset
= path
.rstrip('/') if path_is_dir
else path
1068 if in_svn(path_offset
, prefix
=" "):
1069 raise InternalError("Cannot replay history on top of pre-existing structure: %s" % join_path(source_start_url
, path_offset
))
1070 if path_is_dir
and not os
.path
.exists(path_offset
):
1071 os
.makedirs(path_offset
)
1072 run_svn(["export", "--force", "-r" , source_start_rev
, svnclient
.safe_path(join_path(source_start_url
, path_offset
), source_start_rev
), svnclient
.safe_path(path_offset
)])
1073 run_svn(["add", svnclient
.safe_path(path_offset
)])
1074 # Update any properties on the newly added content
1075 paths
= run_svn(["list", "--recursive", "-r", source_start_rev
, svnclient
.safe_path(source_start_url
, source_start_rev
)])
1076 paths
= paths
.strip("\n").split("\n")
1077 if options
.keep_prop
:
1078 sync_svn_props(source_start_url
, source_start_rev
, "")
1082 # Directories have a trailing slash in the "svn list" output
1083 path_is_dir
= True if path
[-1] == "/" else False
1084 path_offset
= path
.rstrip('/') if path_is_dir
else path
1085 ui
.status(" A %s", join_path(source_base
, path_offset
), level
=ui
.VERBOSE
)
1086 if options
.keep_prop
:
1087 sync_svn_props(source_start_url
, source_start_rev
, path_offset
)
1088 # Commit the initial import
1089 num_entries_proc
+= 1
1090 target_revprops
= gen_tracking_revprops(source_start_rev
) # Build source-tracking revprop's
1091 target_rev
= commit_from_svn_log_entry(source_start_log
, target_revprops
=target_revprops
)
1093 # Update rev_map, mapping table of source-repo rev # -> target-repo rev #
1094 set_rev_map(source_start_rev
, target_rev
)
1096 target_rev_last
= target_rev
1098 verify_commit(source_rev
, target_rev_last
)
1100 # Re-build the rev_map based on any already-replayed history in target_url
1101 build_rev_map(target_url
, target_rev_last
, source_info
)
1103 print "Error: Called with continue-mode, but no already-replayed source history found in target_url."
1105 source_start_rev
= int(max(rev_map
, key
=rev_map
.get
))
1106 assert source_start_rev
1107 ui
.status("Continuing from source revision %s.", source_start_rev
, level
=ui
.VERBOSE
)
1108 ui
.status("", level
=ui
.VERBOSE
)
1110 svn_vers_t
= svnclient
.get_svn_client_version()
1111 svn_vers
= float(".".join(map(str, svn_vers_t
[0:2])))
1113 # Load SVN log starting from source_start_rev + 1
1114 source_ancestors
= find_svn_ancestors(source_repos_url
, source_base
, source_end_rev
, prefix
=" ")
1115 it_log_entries
= svnclient
.iter_svn_log_entries(source_url
, source_start_rev
+1, source_end_rev
, get_revprops
=True, ancestors
=source_ancestors
) if source_start_rev
< source_end_rev
else []
1116 source_rev_last
= source_start_rev
1119 for log_entry
in it_log_entries
:
1120 if options
.entries_proc_limit
:
1121 if num_entries_proc
>= options
.entries_proc_limit
:
1123 # Replay this revision from source_url into target_url
1124 source_rev
= log_entry
['revision']
1125 log_url
= log_entry
['url']
1126 #print "source_url:%s log_url:%s" % (source_url, log_url)
1127 if options
.keep_revnum
:
1128 if source_rev
< target_rev_last
:
1129 print "Error: Last target revision (r%s) is equal-or-higher than starting source revision (r%s). " \
1130 "Cannot use --keep-revnum mode." % (target_rev_last
, source_start_rev
)
1132 target_rev_last
= keep_revnum(source_rev
, target_rev_last
, wc_target_tmp
)
1133 disp_svn_log_summary(log_entry
)
1134 # Process all the changed-paths in this log entry
1136 process_svn_log_entry(log_entry
, source_ancestors
, commit_paths
)
1137 num_entries_proc
+= 1
1138 # Commit any changes made to _wc_target
1139 target_revprops
= gen_tracking_revprops(source_rev
) # Build source-tracking revprop's
1140 target_rev
= commit_from_svn_log_entry(log_entry
, commit_paths
, target_revprops
=target_revprops
)
1141 source_rev_last
= source_rev
1143 # Update rev_map, mapping table of source-repo rev # -> target-repo rev #
1144 source_rev
= log_entry
['revision']
1145 set_rev_map(source_rev
, target_rev
)
1146 target_rev_last
= target_rev
1149 verify_commit(source_rev
, target_rev_last
, log_entry
)
1150 # Run "svn cleanup" every 100 commits if SVN 1.7+, to clean-up orphaned ".svn/pristines/*"
1151 if svn_vers
>= 1.7 and (commit_count
% 100 == 0):
1152 run_svn(["cleanup"])
1153 if source_rev_last
== source_start_rev
:
1154 # If there were no new source_url revisions to process, still trigger
1155 # "full-mode" verify check (if enabled).
1157 verify_commit(source_rev_last
, target_rev_last
)
1159 except KeyboardInterrupt:
1160 print "\nStopped by user."
1161 print "\nCleaning-up..."
1162 run_svn(["cleanup"])
1165 print "\nCommand failed with following error:\n"
1166 traceback
.print_exc()
1167 print "\nCleaning-up..."
1168 run_svn(["cleanup"])
1169 print run_svn(["status"])
1172 print "\nFinished at source revision %s%s." % (source_rev_last
, " (dry-run)" if options
.dry_run
else "")
1175 # Defined as entry point. Must be callable without arguments.
1176 usage
= "svn2svn, version %s\n" % str(full_version
) + \
1177 "<http://nynim.org/projects/svn2svn> <https://github.com/tonyduckles/svn2svn>\n\n" + \
1178 "Usage: %prog [OPTIONS] source_url target_url\n"
1180 Replicate (replay) history from one SVN repository to another. Maintain
1181 logical ancestry wherever possible, so that 'svn log' on the replayed repo
1182 will correctly follow file/folder renames.
1185 Create a copy of only /trunk from source repo, starting at r5000
1186 $ svnadmin create /svn/target
1187 $ svn mkdir -m 'Add trunk' file:///svn/target/trunk
1188 $ svn2svn -av -r 5000 http://server/source/trunk file:///svn/target/trunk
1189 1. The target_url will be checked-out to ./_wc_target
1190 2. The first commit to http://server/source/trunk at/after r5000 will be
1191 exported & added into _wc_target
1192 3. All revisions affecting http://server/source/trunk (starting at r5000)
1193 will be replayed to _wc_target. Any add/copy/move/replaces that are
1194 copy-from'd some path outside of /trunk (e.g. files renamed on a
1195 /branch and branch was merged into /trunk) will correctly maintain
1196 logical ancestry where possible.
1198 Use continue-mode (-c) to pick-up where the last run left-off
1199 $ svn2svn -avc http://server/source/trunk file:///svn/target/trunk
1200 1. The target_url will be checked-out to ./_wc_target, if not already
1202 2. All new revisions affecting http://server/source/trunk starting from
1203 the last replayed revision to file:///svn/target/trunk (based on the
1204 svn2svn:* revprops) will be replayed to _wc_target, maintaining all
1205 logical ancestry where possible."""
1206 parser
= optparse
.OptionParser(usage
, description
=description
,
1207 formatter
=HelpFormatter(), version
="%prog "+str(full_version
))
1208 parser
.add_option("-v", "--verbose", dest
="verbosity", action
="count", default
=1,
1209 help="enable additional output (use -vv or -vvv for more)")
1210 parser
.add_option("-a", "--archive", action
="store_true", dest
="archive", default
=False,
1211 help="archive/mirror mode; same as -UDP (see REQUIRE's below)\n"
1212 "maintain same commit author, same commit time, and file/dir properties")
1213 parser
.add_option("-U", "--keep-author", action
="store_true", dest
="keep_author", default
=False,
1214 help="maintain same commit authors (svn:author) as source\n"
1215 "(REQUIRES 'pre-revprop-change' hook script to allow 'svn:author' changes)")
1216 parser
.add_option("-D", "--keep-date", action
="store_true", dest
="keep_date", default
=False,
1217 help="maintain same commit time (svn:date) as source\n"
1218 "(REQUIRES 'pre-revprop-change' hook script to allow 'svn:date' changes)")
1219 parser
.add_option("-P", "--keep-prop", action
="store_true", dest
="keep_prop", default
=False,
1220 help="maintain same file/dir SVN properties as source")
1221 parser
.add_option("-R", "--keep-revnum", action
="store_true", dest
="keep_revnum", default
=False,
1222 help="maintain same rev #'s as source. creates placeholder target "
1223 "revisions (by modifying a 'svn2svn:keep-revnum' property at the root of the target repo)")
1224 parser
.add_option("-c", "--continue", action
="store_true", dest
="cont_from_break",
1225 help="continue from last source commit to target (based on svn2svn:* revprops)")
1226 parser
.add_option("-f", "--force", action
="store_true", dest
="force_nocont",
1227 help="allow replaying into a non-empty target folder")
1228 parser
.add_option("-r", "--revision", type="string", dest
="revision", metavar
="ARG",
1229 help="revision range to replay from source_url\n"
1230 "A revision argument can be one of:\n"
1231 " START start rev # (end will be 'HEAD')\n"
1232 " START:END start and ending rev #'s\n"
1233 "Any revision # formats which SVN understands are "
1234 "supported, e.g. 'HEAD', '{2010-01-31}', etc.")
1235 parser
.add_option("-u", "--log-author", action
="store_true", dest
="log_author", default
=False,
1236 help="append source commit author to replayed commit mesages")
1237 parser
.add_option("-d", "--log-date", action
="store_true", dest
="log_date", default
=False,
1238 help="append source commit time to replayed commit messages")
1239 parser
.add_option("-l", "--limit", type="int", dest
="entries_proc_limit", metavar
="NUM",
1240 help="maximum number of source revisions to process")
1241 parser
.add_option("-n", "--dry-run", action
="store_true", dest
="dry_run", default
=False,
1242 help="process next source revision but don't commit changes to "
1243 "target working-copy (forces --limit=1)")
1244 parser
.add_option("-x", "--verify", action
="store_const", const
=1, dest
="verify",
1245 help="verify ancestry and content for changed paths in commit after every target commit or last target commit")
1246 parser
.add_option("-X", "--verify-all", action
="store_const", const
=2, dest
="verify",
1247 help="verify ancestry and content for entire target_url tree after every target commit or last target commit")
1248 parser
.add_option("--debug", dest
="verbosity", const
=ui
.DEBUG
, action
="store_const",
1249 help="enable debugging output (same as -vvv)")
1251 options
, args
= parser
.parse_args()
1253 parser
.error("incorrect number of arguments")
1254 if options
.verbosity
< 10:
1255 # Expand multiple "-v" arguments to a real ui._level value
1256 options
.verbosity
*= 10
1258 # When in dry-run mode, only try to process the next log_entry
1259 options
.entries_proc_limit
= 1
1260 options
.rev_start
= None
1261 options
.rev_end
= None
1262 if options
.revision
:
1263 # Reg-ex for matching a revision arg (http://svnbook.red-bean.com/en/1.5/svn.tour.revs.specifiers.html#svn.tour.revs.dates)
1264 rev_patt
= '[0-9A-Z]+|\{[0-9A-Za-z/\\ :-]+\}'
1266 match
= re
.match('^('+rev_patt
+'):('+rev_patt
+')$', options
.revision
) # First try start:end match
1267 if match
is None: match
= re
.match('^('+rev_patt
+')$', options
.revision
) # Next, try start match
1269 parser
.error("unexpected --revision argument format; see 'svn help log' for valid revision formats")
1270 rev
= match
.groups()
1271 options
.rev_start
= rev
[0] if len(rev
)>0 else None
1272 options
.rev_end
= rev
[1] if len(rev
)>1 else None
1274 options
.keep_author
= True
1275 options
.keep_date
= True
1276 options
.keep_prop
= True
1277 ui
.update_config(options
)
1278 return real_main(args
)
1281 if __name__
== "__main__":
1282 sys
.exit(main() or 0)