3 # run_tests.py: test suite for cvs2svn
5 # Usage: run_tests.py [-v | --verbose] [list | <num>]
9 # enable verbose output
11 # Arguments (at most one argument is allowed):
13 # If the word "list" is passed as an argument, the list of
14 # available tests is printed (but no tests are run).
17 # If a number is passed as an argument, then only the test
18 # with that number is run.
20 # If no argument is specified, then all tests are run.
22 # Subversion is a tool for revision control.
23 # See http://subversion.tigris.org for more information.
25 # ====================================================================
26 # Copyright (c) 2000-2009 CollabNet. All rights reserved.
28 # This software is licensed as described in the file COPYING, which
29 # you should have received as part of this distribution. The terms
30 # are also available at http://subversion.tigris.org/license-1.html.
31 # If newer versions of this license are posted there, you may use a
32 # newer version instead, at your option.
34 ######################################################################
49 from hashlib
import md5
52 from difflib
import Differ
54 # Make sure that a supported version of Python is being used:
55 if not (0x02040000 <= sys
.hexversion
< 0x03000000):
57 'error: Python 2, version 2.4 or higher required.\n'
61 # This script needs to run in the correct directory. Make sure we're there.
62 if not (os
.path
.exists('cvs2svn') and os
.path
.exists('test-data')):
63 sys
.stderr
.write("error: I need to be run in the directory containing "
64 "'cvs2svn' and 'test-data'.\n")
67 # Load the Subversion test framework.
69 from svntest
import Failure
70 from svntest
.main
import safe_rmtree
71 from svntest
.testcase
import TestCase
72 from svntest
.testcase
import XFail
74 # Test if Mercurial >= 1.1 is available.
76 from mercurial
import context
79 except (ImportError, AttributeError):
82 cvs2svn
= os
.path
.abspath('cvs2svn')
83 cvs2git
= os
.path
.abspath('cvs2git')
84 cvs2hg
= os
.path
.abspath('cvs2hg')
86 # We use the installed svn and svnlook binaries, instead of using
87 # svntest.main.run_svn() and svntest.main.run_svnlook(), because the
88 # behavior -- or even existence -- of local builds shouldn't affect
89 # the cvs2svn test suite.
91 svnlook_binary
= 'svnlook'
92 svnadmin_binary
= 'svnadmin'
93 svnversion_binary
= 'svnversion'
95 test_data_dir
= 'test-data'
96 tmp_dir
= 'cvs2svn-tmp'
99 #----------------------------------------------------------------------
101 #----------------------------------------------------------------------
104 # The value to expect for svn:keywords if it is set:
105 KEYWORDS
= 'Author Date Id Revision'
108 class RunProgramException(Failure
):
112 class MissingErrorException(Failure
):
113 def __init__(self
, error_re
):
115 self
, "Test failed because no error matched '%s'" % (error_re
,)
119 def run_program(program
, error_re
, *varargs
):
120 """Run PROGRAM with VARARGS, return stdout as a list of lines.
122 If there is any stderr and ERROR_RE is None, raise
123 RunProgramException, and print the stderr lines if
124 svntest.main.options.verbose is true.
126 If ERROR_RE is not None, it is a string regular expression that must
127 match some line of stderr. If it fails to match, raise
128 MissingErrorExpection."""
130 # FIXME: exit_code is currently ignored.
131 exit_code
, out
, err
= svntest
.main
.run_command(program
, 1, 0, *varargs
)
134 # Specified error expected on stderr.
136 raise MissingErrorException(error_re
)
139 if re
.match(error_re
, line
):
141 raise MissingErrorException(error_re
)
145 if svntest
.main
.options
.verbose
:
146 print '\n%s said:\n' % program
150 raise RunProgramException()
155 def run_script(script
, error_re
, *varargs
):
156 """Run Python script SCRIPT with VARARGS, returning stdout as a list
159 If there is any stderr and ERROR_RE is None, raise
160 RunProgramException, and print the stderr lines if
161 svntest.main.options.verbose is true.
163 If ERROR_RE is not None, it is a string regular expression that must
164 match some line of stderr. If it fails to match, raise
165 MissingErrorException."""
167 # Use the same python that is running this script
168 return run_program(sys
.executable
, error_re
, script
, *varargs
)
169 # On Windows, for an unknown reason, the cmd.exe process invoked by
170 # os.system('sort ...') in cvs2svn receives invalid stdio handles, if
171 # cvs2svn is started as "cvs2svn ...". "python cvs2svn ..." avoids
172 # this. Therefore, the redirection of the output to the .s-revs file fails.
173 # We no longer use the problematic invocation on any system, but this
174 # comment remains to warn about this problem.
177 def run_svn(*varargs
):
178 """Run svn with VARARGS; return stdout as a list of lines.
179 If there is any stderr, raise RunProgramException, and print the
180 stderr lines if svntest.main.options.verbose is true."""
181 return run_program(svn_binary
, None, *varargs
)
184 def repos_to_url(path_to_svn_repos
):
185 """This does what you think it does."""
186 rpath
= os
.path
.abspath(path_to_svn_repos
)
189 return 'file://%s' % rpath
.replace(os
.sep
, '/')
192 def svn_strptime(timestr
):
193 return time
.strptime(timestr
, '%Y-%m-%d %H:%M:%S')
197 def __init__(self
, revision
, author
, date
, symbols
):
198 self
.revision
= revision
201 # Internally, we represent the date as seconds since epoch (UTC).
202 # Since standard subversion log output shows dates in localtime
204 # "1993-06-18 00:46:07 -0500 (Fri, 18 Jun 1993)"
206 # and time.mktime() converts from localtime, it all works out very
208 self
.date
= time
.mktime(svn_strptime(date
[0:19]))
210 # The following symbols are used for string interpolation when
212 self
.symbols
= symbols
214 # The changed paths will be accumulated later, as log data is read.
215 # Keys here are paths such as '/trunk/foo/bar', values are letter
216 # codes such as 'M', 'A', and 'D'.
217 self
.changed_paths
= { }
219 # The msg will be accumulated later, as log data is read.
222 def absorb_changed_paths(self
, out
):
223 'Read changed paths from OUT into self, until no more.'
225 line
= out
.readline()
226 if len(line
) == 1: return
228 op_portion
= line
[3:4]
229 path_portion
= line
[5:]
230 # If we're running on Windows we get backslashes instead of
232 path_portion
= path_portion
.replace('\\', '/')
233 # # We could parse out history information, but currently we
234 # # just leave it in the path portion because that's how some
237 # m = re.match("(.*) \(from /.*:[0-9]+\)", path_portion)
239 # path_portion = m.group(1)
240 self
.changed_paths
[path_portion
] = op_portion
242 def __cmp__(self
, other
):
243 return cmp(self
.revision
, other
.revision
) or \
244 cmp(self
.author
, other
.author
) or cmp(self
.date
, other
.date
) or \
245 cmp(self
.changed_paths
, other
.changed_paths
) or \
246 cmp(self
.msg
, other
.msg
)
248 def get_path_op(self
, path
):
249 """Return the operator for the change involving PATH.
251 PATH is allowed to include string interpolation directives (e.g.,
252 '%(trunk)s'), which are interpolated against self.symbols. Return
253 None if there is no record for PATH."""
254 return self
.changed_paths
.get(path
% self
.symbols
)
256 def check_msg(self
, msg
):
257 """Verify that this Log's message starts with the specified MSG."""
258 if self
.msg
.find(msg
) != 0:
260 "Revision %d log message was:\n%s\n\n"
261 "It should have begun with:\n%s\n\n"
262 % (self
.revision
, self
.msg
, msg
,)
265 def check_change(self
, path
, op
):
266 """Verify that this Log includes a change for PATH with operator OP.
268 PATH is allowed to include string interpolation directives (e.g.,
269 '%(trunk)s'), which are interpolated against self.symbols."""
271 path
= path
% self
.symbols
272 found_op
= self
.changed_paths
.get(path
, None)
275 "Revision %d does not include change for path %s "
276 "(it should have been %s).\n"
277 % (self
.revision
, path
, op
,)
281 "Revision %d path %s had op %s (it should have been %s)\n"
282 % (self
.revision
, path
, found_op
, op
,)
285 def check_changes(self
, changed_paths
):
286 """Verify that this Log has precisely the CHANGED_PATHS specified.
288 CHANGED_PATHS is a sequence of tuples (path, op), where the paths
289 strings are allowed to include string interpolation directives
290 (e.g., '%(trunk)s'), which are interpolated against self.symbols."""
293 for (path
, op
) in changed_paths
:
294 cp
[path
% self
.symbols
] = op
296 if self
.changed_paths
!= cp
:
298 "Revision %d changed paths list was:\n%s\n\n"
299 "It should have been:\n%s\n\n"
300 % (self
.revision
, self
.changed_paths
, cp
,)
303 def check(self
, msg
, changed_paths
):
304 """Verify that this Log has the MSG and CHANGED_PATHS specified.
306 Convenience function to check two things at once. MSG is passed
307 to check_msg(); CHANGED_PATHS is passed to check_changes()."""
310 self
.check_changes(changed_paths
)
313 def parse_log(svn_repos
, symbols
):
314 """Return a dictionary of Logs, keyed on revision number, for SVN_REPOS.
316 Initialize the Logs' symbols with SYMBOLS."""
319 'Make a list of lines behave like an open file handle.'
320 def __init__(self
, lines
):
323 if len(self
.lines
) > 0:
324 return self
.lines
.pop(0)
328 def absorb_message_body(out
, num_lines
, log
):
329 """Read NUM_LINES of log message body from OUT into Log item LOG."""
331 for i
in range(num_lines
):
332 log
.msg
+= out
.readline()
334 log_start_re
= re
.compile('^r(?P<rev>[0-9]+) \| '
335 '(?P<author>[^\|]+) \| '
337 '\| (?P<lines>[0-9]+) (line|lines)$')
339 log_separator
= '-' * 72
343 out
= LineFeeder(run_svn('log', '-v', repos_to_url(svn_repos
)))
347 line
= out
.readline()
351 if line
.find(log_separator
) == 0:
352 line
= out
.readline()
355 m
= log_start_re
.match(line
)
358 int(m
.group('rev')), m
.group('author'), m
.group('date'), symbols
)
359 line
= out
.readline()
360 if not line
.find('Changed paths:') == 0:
361 print 'unexpected log output (missing changed paths)'
362 print "Line: '%s'" % line
364 this_log
.absorb_changed_paths(out
)
365 absorb_message_body(out
, int(m
.group('lines')), this_log
)
366 logs
[this_log
.revision
] = this_log
368 break # We've reached the end of the log output.
370 print 'unexpected log output (missing revision line)'
371 print "Line: '%s'" % line
374 print 'unexpected log output (missing log separator)'
375 print "Line: '%s'" % line
382 """Unconditionally remove PATH and its subtree, if any. PATH may be
383 non-existent, a file or symlink, or a directory."""
384 if os
.path
.isdir(path
):
386 elif os
.path
.exists(path
):
390 log_msg_text_wrapper
= textwrap
.TextWrapper(width
=76, break_long_words
=False)
392 def sym_log_msg(symbolic_name
, is_tag
=None):
393 """Return the expected log message for a cvs2svn-synthesized revision
394 creating branch or tag SYMBOLIC_NAME."""
396 # This reproduces the logic in SVNSymbolCommit.get_log_msg().
402 return log_msg_text_wrapper
.fill(
403 "This commit was manufactured by cvs2svn to create %s '%s'."
404 % (type, symbolic_name
)
408 def make_conversion_id(
409 name
, args
, passbypass
, options_file
=None, symbol_hints_file
=None
411 """Create an identifying tag for a conversion.
413 The return value can also be used as part of a filesystem path.
415 NAME is the name of the CVS repository.
417 ARGS are the extra arguments to be passed to cvs2svn.
419 PASSBYPASS is a boolean indicating whether the conversion is to be
420 run one pass at a time.
422 If OPTIONS_FILE is specified, it is an options file that will be
423 used for the conversion.
425 If SYMBOL_HINTS_FILE is specified, it is a symbol hints file that
426 will be used for the conversion.
428 The 1-to-1 mapping between cvs2svn command parameters and
429 conversion_ids allows us to avoid running the same conversion more
430 than once, when multiple tests use exactly the same conversion."""
437 args
.append('--passbypass')
439 if symbol_hints_file
is not None:
440 args
.append('--symbol-hints=%s' % (symbol_hints_file
,))
442 # There are some characters that are forbidden in filenames, and
443 # there is a limit on the total length of a path to a file. So use
444 # a hash of the parameters rather than concatenating the parameters
447 conv_id
+= "-" + md5('\0'.join(args
)).hexdigest()
449 # Some options-file based tests rely on knowing the paths to which
450 # the repository should be written, so we handle that option as a
451 # predictable string:
452 if options_file
is not None:
453 conv_id
+= '--options=%s' % (options_file
,)
459 """A record of a cvs2svn conversion.
463 conv_id -- the conversion id for this Conversion.
465 name -- a one-word name indicating the involved repositories.
467 dumpfile -- the name of the SVN dumpfile created by the conversion
468 (if the DUMPFILE constructor argument was used); otherwise,
471 repos -- the path to the svn repository. Unset if DUMPFILE was
474 logs -- a dictionary of Log instances, as returned by parse_log().
475 Unset if DUMPFILE was specified.
477 symbols -- a dictionary of symbols used for string interpolation
480 stdout -- a list of lines written by cvs2svn to stdout
482 _wc -- the basename of the svn working copy (within tmp_dir).
483 Unset if DUMPFILE was specified.
485 _wc_path -- the path to the svn working copy, if it has already
486 been created; otherwise, None. (The working copy is created
487 lazily when get_wc() is called.) Unset if DUMPFILE was
490 _wc_tree -- the tree built from the svn working copy, if it has
491 already been created; otherwise, None. The tree is created
492 lazily when get_wc_tree() is called.) Unset if DUMPFILE was
495 _svnrepos -- the basename of the svn repository (within tmp_dir).
496 Unset if DUMPFILE was specified."""
498 # The number of the last cvs2svn pass (determined lazily by
503 def get_last_pass(cls
):
504 """Return the number of cvs2svn's last pass."""
506 if cls
.last_pass
is None:
507 out
= run_script(cvs2svn
, None, '--help-passes')
508 cls
.last_pass
= int(out
[-1].split()[0])
512 self
, conv_id
, name
, error_re
, passbypass
, symbols
, args
,
513 options_file
=None, symbol_hints_file
=None, dumpfile
=None,
515 self
.conv_id
= conv_id
517 self
.symbols
= symbols
518 if not os
.path
.isdir(tmp_dir
):
521 cvsrepos
= os
.path
.join(test_data_dir
, '%s-cvsrepos' % self
.name
)
524 self
.dumpfile
= os
.path
.join(tmp_dir
, dumpfile
)
525 # Clean up from any previous invocations of this script.
529 self
.repos
= os
.path
.join(tmp_dir
, '%s-svnrepos' % self
.conv_id
)
530 self
._wc
= os
.path
.join(tmp_dir
, '%s-wc' % self
.conv_id
)
534 # Clean up from any previous invocations of this script.
540 '--svnadmin=%s' % (svntest
.main
.svnadmin_binary
,),
543 self
.options_file
= os
.path
.join(cvsrepos
, options_file
)
545 '--options=%s' % self
.options_file
,
547 assert not symbol_hints_file
549 self
.options_file
= None
550 if tmp_dir
!= 'cvs2svn-tmp':
551 # Only include this argument if it differs from cvs2svn's default:
553 '--tmpdir=%s' % tmp_dir
,
556 if symbol_hints_file
:
557 self
.symbol_hints_file
= os
.path
.join(cvsrepos
, symbol_hints_file
)
559 '--symbol-hints=%s' % self
.symbol_hints_file
,
563 args
.extend(['--dumpfile=%s' % (self
.dumpfile
,)])
565 args
.extend(['-s', self
.repos
])
566 args
.extend([cvsrepos
])
570 for p
in range(1, self
.get_last_pass() + 1):
571 self
.stdout
+= run_script(cvs2svn
, error_re
, '-p', str(p
), *args
)
573 self
.stdout
= run_script(cvs2svn
, error_re
, *args
)
576 if not os
.path
.isfile(self
.dumpfile
):
578 "Dumpfile not created: '%s'"
579 % os
.path
.join(os
.getcwd(), self
.dumpfile
)
582 if os
.path
.isdir(self
.repos
):
583 self
.logs
= parse_log(self
.repos
, self
.symbols
)
584 elif error_re
is None:
586 "Repository not created: '%s'"
587 % os
.path
.join(os
.getcwd(), self
.repos
)
590 def output_found(self
, pattern
):
591 """Return True if PATTERN matches any line in self.stdout.
593 PATTERN is a regular expression pattern as a string.
596 pattern_re
= re
.compile(pattern
)
598 for line
in self
.stdout
:
599 if pattern_re
.match(line
):
600 # We found the pattern that we were looking for.
605 def find_tag_log(self
, tagname
):
606 """Search LOGS for a log message containing 'TAGNAME' and return the
607 log in which it was found."""
608 for i
in xrange(len(self
.logs
), 0, -1):
609 if self
.logs
[i
].msg
.find("'"+tagname
+"'") != -1:
611 raise ValueError("Tag %s not found in logs" % tagname
)
613 def get_wc(self
, *args
):
614 """Return the path to the svn working copy, or a path within the WC.
616 If a working copy has not been created yet, create it now.
618 If ARGS are specified, then they should be strings that form
619 fragments of a path within the WC. They are joined using
620 os.path.join() and appended to the WC path."""
622 if self
._wc
_path
is None:
623 run_svn('co', repos_to_url(self
.repos
), self
._wc
)
624 self
._wc
_path
= self
._wc
625 return os
.path
.join(self
._wc
_path
, *args
)
627 def get_wc_tree(self
):
628 if self
._wc
_tree
is None:
629 self
._wc
_tree
= svntest
.tree
.build_tree_from_wc(self
.get_wc(), 1)
632 def path_exists(self
, *args
):
633 """Return True if the specified path exists within the repository.
635 (The strings in ARGS are first joined into a path using
638 return os
.path
.exists(self
.get_wc(*args
))
640 def check_props(self
, keys
, checks
):
641 """Helper function for checking lots of properties. For a list of
642 files in the conversion, check that the values of the properties
643 listed in KEYS agree with those listed in CHECKS. CHECKS is a
644 list of tuples: [ (filename, [value, value, ...]), ...], where the
645 values are listed in the same order as the key names are listed in
648 for (file, values
) in checks
:
649 assert len(values
) == len(keys
)
650 props
= props_for_path(self
.get_wc_tree(), file)
651 for i
in range(len(keys
)):
652 if props
.get(keys
[i
]) != values
[i
]:
654 "File %s has property %s set to \"%s\" "
655 "(it should have been \"%s\").\n"
656 % (file, keys
[i
], props
.get(keys
[i
]), values
[i
],)
661 """A record of a cvs2svn conversion.
665 name -- a one-word name indicating the CVS repository to be converted.
667 stdout -- a list of lines written by cvs2svn to stdout."""
669 def __init__(self
, name
, error_re
, args
, options_file
=None):
671 if not os
.path
.isdir(tmp_dir
):
674 cvsrepos
= os
.path
.join(test_data_dir
, '%s-cvsrepos' % self
.name
)
678 self
.options_file
= os
.path
.join(cvsrepos
, options_file
)
680 '--options=%s' % self
.options_file
,
683 self
.options_file
= None
685 self
.stdout
= run_script(cvs2git
, error_re
, *args
)
688 # Cache of conversions that have already been done. Keys are conv_id;
689 # values are Conversion instances.
690 already_converted
= { }
692 def ensure_conversion(
693 name
, error_re
=None, passbypass
=None,
694 trunk
=None, branches
=None, tags
=None,
695 args
=None, options_file
=None, symbol_hints_file
=None, dumpfile
=None,
697 """Convert CVS repository NAME to Subversion, but only if it has not
698 been converted before by this invocation of this script. If it has
699 been converted before, return the Conversion object from the
702 If no error, return a Conversion instance.
704 If ERROR_RE is a string, it is a regular expression expected to
705 match some line of stderr printed by the conversion. If there is an
706 error and ERROR_RE is not set, then raise Failure.
708 If PASSBYPASS is set, then cvs2svn is run multiple times, each time
709 with a -p option starting at 1 and increasing to a (hardcoded) maximum.
711 NAME is just one word. For example, 'main' would mean to convert
712 './test-data/main-cvsrepos', and after the conversion, the resulting
713 Subversion repository would be in './cvs2svn-tmp/main-svnrepos', and
714 a checked out head working copy in './cvs2svn-tmp/main-wc'.
716 Any other options to pass to cvs2svn should be in ARGS, each element
717 being one option, e.g., '--trunk-only'. If the option takes an
718 argument, include it directly, e.g., '--mime-types=PATH'. Arguments
719 are passed to cvs2svn in the order that they appear in ARGS.
721 If OPTIONS_FILE is specified, then it should be the name of a file
722 within the main directory of the cvs repository associated with this
723 test. It is passed to cvs2svn using the --options option (which
724 suppresses some other options that are incompatible with --options).
726 If SYMBOL_HINTS_FILE is specified, then it should be the name of a
727 file within the main directory of the cvs repository associated with
728 this test. It is passed to cvs2svn using the --symbol-hints option.
730 If DUMPFILE is specified, then it is the name of a dumpfile within
731 the temporary directory to which the conversion output should be
742 args
.append('--trunk=%s' % (trunk
,))
745 branches
= 'branches'
747 args
.append('--branches=%s' % (branches
,))
752 args
.append('--tags=%s' % (tags
,))
754 conv_id
= make_conversion_id(
755 name
, args
, passbypass
, options_file
, symbol_hints_file
758 if conv_id
not in already_converted
:
760 # Run the conversion and store the result for the rest of this
762 already_converted
[conv_id
] = Conversion(
763 conv_id
, name
, error_re
, passbypass
,
764 {'trunk' : trunk
, 'branches' : branches
, 'tags' : tags
},
765 args
, options_file
, symbol_hints_file
, dumpfile
,
768 # Remember the failure so that a future attempt to run this conversion
769 # does not bother to retry, but fails immediately.
770 already_converted
[conv_id
] = None
773 conv
= already_converted
[conv_id
]
779 class Cvs2SvnTestFunction(TestCase
):
780 """A TestCase based on a naked Python function object.
782 FUNC should be a function that returns None on success and throws an
783 svntest.Failure exception on failure. It should have a brief
784 docstring describing what it does (and fulfilling certain
785 conditions). FUNC must take no arguments.
787 This class is almost identical to svntest.testcase.FunctionTestCase,
788 except that the test function does not require a sandbox and does
789 not accept any parameter (not even sandbox=None).
791 This class can be used as an annotation on a Python function.
795 def __init__(self
, func
):
796 # it better be a function that accepts no parameters and has a
798 assert isinstance(func
, types
.FunctionType
)
800 name
= func
.func_name
802 assert func
.func_code
.co_argcount
== 0, \
803 '%s must not take any arguments' % name
805 doc
= func
.__doc
__.strip()
806 assert doc
, '%s must have a docstring' % name
808 # enforce stylistic guidelines for the function docstrings:
809 # - no longer than 50 characters
810 # - should not end in a period
811 # - should not be capitalized
812 assert len(doc
) <= 50, \
813 "%s's docstring must be 50 characters or less" % name
814 assert doc
[-1] != '.', \
815 "%s's docstring should not end in a period" % name
816 assert doc
[0].lower() == doc
[0], \
817 "%s's docstring should not be capitalized" % name
819 TestCase
.__init
__(self
, doc
=doc
)
822 def get_function_name(self
):
823 return self
.func
.func_name
825 def get_sandbox_name(self
):
828 def run(self
, sandbox
):
832 class Cvs2HgTestFunction(Cvs2SvnTestFunction
):
833 """Same as Cvs2SvnTestFunction, but for test cases that should be
834 skipped if Mercurial is not available.
836 def run(self
, sandbox
):
843 class Cvs2SvnTestCase(TestCase
):
845 self
, name
, doc
=None, variant
=None,
846 error_re
=None, passbypass
=None,
847 trunk
=None, branches
=None, tags
=None,
849 options_file
=None, symbol_hints_file
=None, dumpfile
=None,
854 # By default, use the first line of the class docstring as the
856 doc
= self
.__doc
__.splitlines()[0]
858 if variant
is not None:
859 # Modify doc to show the variant. Trim doc first if necessary
860 # to stay within the 50-character limit.
861 suffix
= '...variant %s' % (variant
,)
862 doc
= doc
[:50 - len(suffix
)] + suffix
864 TestCase
.__init
__(self
, doc
=doc
)
866 self
.error_re
= error_re
867 self
.passbypass
= passbypass
869 self
.branches
= branches
872 self
.options_file
= options_file
873 self
.symbol_hints_file
= symbol_hints_file
874 self
.dumpfile
= dumpfile
876 def ensure_conversion(self
):
877 return ensure_conversion(
879 error_re
=self
.error_re
, passbypass
=self
.passbypass
,
880 trunk
=self
.trunk
, branches
=self
.branches
, tags
=self
.tags
,
882 options_file
=self
.options_file
,
883 symbol_hints_file
=self
.symbol_hints_file
,
884 dumpfile
=self
.dumpfile
,
887 def get_sandbox_name(self
):
891 class Cvs2SvnPropertiesTestCase(Cvs2SvnTestCase
):
892 """Test properties resulting from a conversion."""
894 def __init__(self
, name
, props_to_test
, expected_props
, **kw
):
895 """Initialize an instance of Cvs2SvnPropertiesTestCase.
897 NAME is the name of the test, passed to Cvs2SvnTestCase.
898 PROPS_TO_TEST is a list of the names of svn properties that should
899 be tested. EXPECTED_PROPS is a list of tuples [(filename,
900 [value,...])], where the second item in each tuple is a list of
901 values expected for the properties listed in PROPS_TO_TEST for the
902 specified filename. If a property must *not* be set, then its
903 value should be listed as None."""
905 Cvs2SvnTestCase
.__init
__(self
, name
, **kw
)
906 self
.props_to_test
= props_to_test
907 self
.expected_props
= expected_props
910 conv
= self
.ensure_conversion()
911 conv
.check_props(self
.props_to_test
, self
.expected_props
)
914 #----------------------------------------------------------------------
916 #----------------------------------------------------------------------
921 "cvs2svn with no arguments shows usage"
922 out
= run_script(cvs2svn
, None)
923 if (len(out
) > 2 and out
[0].find('ERROR:') == 0
924 and out
[1].find('DBM module')):
925 print 'cvs2svn cannot execute due to lack of proper DBM module.'
926 print 'Exiting without running any further tests.'
928 if out
[0].find('Usage:') < 0:
929 raise Failure('Basic cvs2svn invocation failed.')
933 def cvs2svn_manpage():
934 "generate a manpage for cvs2svn"
935 out
= run_script(cvs2svn
, None, '--man')
939 def cvs2git_manpage():
940 "generate a manpage for cvs2git"
941 out
= run_script(cvs2git
, None, '--man')
945 def cvs2hg_manpage():
946 "generate a manpage for cvs2hg"
947 out
= run_script(cvs2hg
, None, '--man')
951 def show_help_passes():
952 "cvs2svn --help-passes shows pass information"
953 out
= run_script(cvs2svn
, None, '--help-passes')
954 if out
[0].find('PASSES') < 0:
955 raise Failure('cvs2svn --help-passes failed.')
960 "detection of the executable flag"
961 if sys
.platform
== 'win32':
963 conv
= ensure_conversion('main')
964 st
= os
.stat(conv
.get_wc('trunk', 'single-files', 'attr-exec'))
965 if not st
.st_mode
& stat
.S_IXUSR
:
971 "conversion of filename with a space"
972 conv
= ensure_conversion('main')
973 if not conv
.path_exists('trunk', 'single-files', 'space fname'):
979 "two commits in quick succession"
980 conv
= ensure_conversion('main')
982 os
.path
.join(conv
.repos
, 'trunk', 'single-files', 'twoquick'), {})
987 class PruneWithCare(Cvs2SvnTestCase
):
988 "prune, but never too much"
990 def __init__(self
, **kw
):
991 Cvs2SvnTestCase
.__init
__(self
, 'main', **kw
)
994 # Robert Pluim encountered this lovely one while converting the
995 # directory src/gnu/usr.bin/cvs/contrib/pcl-cvs/ in FreeBSD's CVS
996 # repository (see issue #1302). Step 4 is the doozy:
998 # revision 1: adds trunk/blah/, adds trunk/blah/first
999 # revision 2: adds trunk/blah/second
1000 # revision 3: deletes trunk/blah/first
1001 # revision 4: deletes blah [re-deleting trunk/blah/first pruned blah!]
1002 # revision 5: does nothing
1004 # After fixing cvs2svn, the sequence (correctly) looks like this:
1006 # revision 1: adds trunk/blah/, adds trunk/blah/first
1007 # revision 2: adds trunk/blah/second
1008 # revision 3: deletes trunk/blah/first
1009 # revision 4: does nothing [because trunk/blah/first already deleted]
1010 # revision 5: deletes blah
1012 # The difference is in 4 and 5. In revision 4, it's not correct
1013 # to prune blah/, because second is still in there, so revision 4
1014 # does nothing now. But when we delete second in 5, that should
1015 # bubble up and prune blah/ instead.
1017 # ### Note that empty revisions like 4 are probably going to become
1018 # ### at least optional, if not banished entirely from cvs2svn's
1019 # ### output. Hmmm, or they may stick around, with an extra
1020 # ### revision property explaining what happened. Need to think
1021 # ### about that. In some sense, it's a bug in Subversion itself,
1022 # ### that such revisions don't show up in 'svn log' output.
1024 conv
= self
.ensure_conversion()
1026 # Confirm that revision 4 removes '/trunk/full-prune/first',
1027 # and that revision 6 removes '/trunk/full-prune'.
1029 # Also confirm similar things about '/full-prune-reappear/...',
1030 # which is similar, except that later on it reappears, restored
1031 # from pruneland, because a file gets added to it.
1033 # And finally, a similar thing for '/partial-prune/...', except that
1034 # in its case, a permanent file on the top level prevents the
1035 # pruning from going farther than the subdirectory containing first
1038 for path
in ('full-prune/first',
1039 'full-prune-reappear/sub/first',
1040 'partial-prune/sub/first'):
1041 conv
.logs
[5].check_change('/%(trunk)s/' + path
, 'D')
1043 for path
in ('full-prune',
1044 'full-prune-reappear',
1045 'partial-prune/sub'):
1046 conv
.logs
[7].check_change('/%(trunk)s/' + path
, 'D')
1048 for path
in ('full-prune-reappear',
1049 'full-prune-reappear/appears-later'):
1050 conv
.logs
[33].check_change('/%(trunk)s/' + path
, 'A')
1053 @Cvs2SvnTestFunction
1054 def interleaved_commits():
1055 "two interleaved trunk commits, different log msgs"
1056 # See test-data/main-cvsrepos/proj/README.
1057 conv
= ensure_conversion('main')
1059 # The initial import.
1061 conv
.logs
[rev
].check('Initial import.', (
1062 ('/%(trunk)s/interleaved', 'A'),
1063 ('/%(trunk)s/interleaved/1', 'A'),
1064 ('/%(trunk)s/interleaved/2', 'A'),
1065 ('/%(trunk)s/interleaved/3', 'A'),
1066 ('/%(trunk)s/interleaved/4', 'A'),
1067 ('/%(trunk)s/interleaved/5', 'A'),
1068 ('/%(trunk)s/interleaved/a', 'A'),
1069 ('/%(trunk)s/interleaved/b', 'A'),
1070 ('/%(trunk)s/interleaved/c', 'A'),
1071 ('/%(trunk)s/interleaved/d', 'A'),
1072 ('/%(trunk)s/interleaved/e', 'A'),
1075 def check_letters(rev
):
1076 """Check if REV is the rev where only letters were committed."""
1078 conv
.logs
[rev
].check('Committing letters only.', (
1079 ('/%(trunk)s/interleaved/a', 'M'),
1080 ('/%(trunk)s/interleaved/b', 'M'),
1081 ('/%(trunk)s/interleaved/c', 'M'),
1082 ('/%(trunk)s/interleaved/d', 'M'),
1083 ('/%(trunk)s/interleaved/e', 'M'),
1086 def check_numbers(rev
):
1087 """Check if REV is the rev where only numbers were committed."""
1089 conv
.logs
[rev
].check('Committing numbers only.', (
1090 ('/%(trunk)s/interleaved/1', 'M'),
1091 ('/%(trunk)s/interleaved/2', 'M'),
1092 ('/%(trunk)s/interleaved/3', 'M'),
1093 ('/%(trunk)s/interleaved/4', 'M'),
1094 ('/%(trunk)s/interleaved/5', 'M'),
1097 # One of the commits was letters only, the other was numbers only.
1098 # But they happened "simultaneously", so we don't assume anything
1099 # about which commit appeared first, so we just try both ways.
1103 check_numbers(rev
+ 1)
1106 check_letters(rev
+ 1)
1109 @Cvs2SvnTestFunction
1110 def simple_commits():
1111 "simple trunk commits"
1112 # See test-data/main-cvsrepos/proj/README.
1113 conv
= ensure_conversion('main')
1115 # The initial import.
1116 conv
.logs
[13].check('Initial import.', (
1117 ('/%(trunk)s/proj', 'A'),
1118 ('/%(trunk)s/proj/default', 'A'),
1119 ('/%(trunk)s/proj/sub1', 'A'),
1120 ('/%(trunk)s/proj/sub1/default', 'A'),
1121 ('/%(trunk)s/proj/sub1/subsubA', 'A'),
1122 ('/%(trunk)s/proj/sub1/subsubA/default', 'A'),
1123 ('/%(trunk)s/proj/sub1/subsubB', 'A'),
1124 ('/%(trunk)s/proj/sub1/subsubB/default', 'A'),
1125 ('/%(trunk)s/proj/sub2', 'A'),
1126 ('/%(trunk)s/proj/sub2/default', 'A'),
1127 ('/%(trunk)s/proj/sub2/subsubA', 'A'),
1128 ('/%(trunk)s/proj/sub2/subsubA/default', 'A'),
1129 ('/%(trunk)s/proj/sub3', 'A'),
1130 ('/%(trunk)s/proj/sub3/default', 'A'),
1134 conv
.logs
[18].check('First commit to proj, affecting two files.', (
1135 ('/%(trunk)s/proj/sub1/subsubA/default', 'M'),
1136 ('/%(trunk)s/proj/sub3/default', 'M'),
1139 # The second commit.
1140 conv
.logs
[19].check('Second commit to proj, affecting all 7 files.', (
1141 ('/%(trunk)s/proj/default', 'M'),
1142 ('/%(trunk)s/proj/sub1/default', 'M'),
1143 ('/%(trunk)s/proj/sub1/subsubA/default', 'M'),
1144 ('/%(trunk)s/proj/sub1/subsubB/default', 'M'),
1145 ('/%(trunk)s/proj/sub2/default', 'M'),
1146 ('/%(trunk)s/proj/sub2/subsubA/default', 'M'),
1147 ('/%(trunk)s/proj/sub3/default', 'M')
1151 class SimpleTags(Cvs2SvnTestCase
):
1152 "simple tags and branches, no commits"
1154 def __init__(self
, **kw
):
1155 # See test-data/main-cvsrepos/proj/README.
1156 Cvs2SvnTestCase
.__init
__(self
, 'main', **kw
)
1158 def run(self
, sbox
):
1159 conv
= self
.ensure_conversion()
1161 # Verify the copy source for the tags we are about to check
1162 # No need to verify the copyfrom revision, as simple_commits did that
1163 conv
.logs
[13].check('Initial import.', (
1164 ('/%(trunk)s/proj', 'A'),
1165 ('/%(trunk)s/proj/default', 'A'),
1166 ('/%(trunk)s/proj/sub1', 'A'),
1167 ('/%(trunk)s/proj/sub1/default', 'A'),
1168 ('/%(trunk)s/proj/sub1/subsubA', 'A'),
1169 ('/%(trunk)s/proj/sub1/subsubA/default', 'A'),
1170 ('/%(trunk)s/proj/sub1/subsubB', 'A'),
1171 ('/%(trunk)s/proj/sub1/subsubB/default', 'A'),
1172 ('/%(trunk)s/proj/sub2', 'A'),
1173 ('/%(trunk)s/proj/sub2/default', 'A'),
1174 ('/%(trunk)s/proj/sub2/subsubA', 'A'),
1175 ('/%(trunk)s/proj/sub2/subsubA/default', 'A'),
1176 ('/%(trunk)s/proj/sub3', 'A'),
1177 ('/%(trunk)s/proj/sub3/default', 'A'),
1180 fromstr
= ' (from /%(branches)s/B_FROM_INITIALS:14)'
1182 # Tag on rev 1.1.1.1 of all files in proj
1183 conv
.logs
[14].check(sym_log_msg('B_FROM_INITIALS'), (
1184 ('/%(branches)s/B_FROM_INITIALS (from /%(trunk)s:13)', 'A'),
1185 ('/%(branches)s/B_FROM_INITIALS/single-files', 'D'),
1186 ('/%(branches)s/B_FROM_INITIALS/partial-prune', 'D'),
1189 # The same, as a tag
1190 log
= conv
.find_tag_log('T_ALL_INITIAL_FILES')
1191 log
.check(sym_log_msg('T_ALL_INITIAL_FILES',1), (
1192 ('/%(tags)s/T_ALL_INITIAL_FILES'+fromstr
, 'A'),
1195 # Tag on rev 1.1.1.1 of all files in proj, except one
1196 log
= conv
.find_tag_log('T_ALL_INITIAL_FILES_BUT_ONE')
1197 log
.check(sym_log_msg('T_ALL_INITIAL_FILES_BUT_ONE',1), (
1198 ('/%(tags)s/T_ALL_INITIAL_FILES_BUT_ONE'+fromstr
, 'A'),
1199 ('/%(tags)s/T_ALL_INITIAL_FILES_BUT_ONE/proj/sub1/subsubB', 'D'),
1202 # The same, as a branch
1203 conv
.logs
[17].check(sym_log_msg('B_FROM_INITIALS_BUT_ONE'), (
1204 ('/%(branches)s/B_FROM_INITIALS_BUT_ONE'+fromstr
, 'A'),
1205 ('/%(branches)s/B_FROM_INITIALS_BUT_ONE/proj/sub1/subsubB', 'D'),
1209 @Cvs2SvnTestFunction
1210 def simple_branch_commits():
1211 "simple branch commits"
1212 # See test-data/main-cvsrepos/proj/README.
1213 conv
= ensure_conversion('main')
1215 conv
.logs
[23].check('Modify three files, on branch B_MIXED.', (
1216 ('/%(branches)s/B_MIXED/proj/default', 'M'),
1217 ('/%(branches)s/B_MIXED/proj/sub1/default', 'M'),
1218 ('/%(branches)s/B_MIXED/proj/sub2/subsubA/default', 'M'),
1222 @Cvs2SvnTestFunction
1223 def mixed_time_tag():
1225 # See test-data/main-cvsrepos/proj/README.
1226 conv
= ensure_conversion('main')
1228 log
= conv
.find_tag_log('T_MIXED')
1230 ('/%(tags)s/T_MIXED (from /%(branches)s/B_MIXED:20)', 'A'),
1234 @Cvs2SvnTestFunction
1235 def mixed_time_branch_with_added_file():
1236 "mixed-time branch, and a file added to the branch"
1237 # See test-data/main-cvsrepos/proj/README.
1238 conv
= ensure_conversion('main')
1240 # A branch from the same place as T_MIXED in the previous test,
1241 # plus a file added directly to the branch
1242 conv
.logs
[20].check(sym_log_msg('B_MIXED'), (
1243 ('/%(branches)s/B_MIXED (from /%(trunk)s:19)', 'A'),
1244 ('/%(branches)s/B_MIXED/partial-prune', 'D'),
1245 ('/%(branches)s/B_MIXED/single-files', 'D'),
1246 ('/%(branches)s/B_MIXED/proj/sub2/subsubA '
1247 '(from /%(trunk)s/proj/sub2/subsubA:13)', 'R'),
1248 ('/%(branches)s/B_MIXED/proj/sub3 (from /%(trunk)s/proj/sub3:18)', 'R'),
1251 conv
.logs
[22].check('Add a file on branch B_MIXED.', (
1252 ('/%(branches)s/B_MIXED/proj/sub2/branch_B_MIXED_only', 'A'),
1256 @Cvs2SvnTestFunction
1258 "a commit affecting both trunk and a branch"
1259 # See test-data/main-cvsrepos/proj/README.
1260 conv
= ensure_conversion('main')
1262 conv
.logs
[24].check(
1263 'A single commit affecting one file on branch B_MIXED '
1264 'and one on trunk.', (
1265 ('/%(trunk)s/proj/sub2/default', 'M'),
1266 ('/%(branches)s/B_MIXED/proj/sub2/branch_B_MIXED_only', 'M'),
1270 @Cvs2SvnTestFunction
1271 def split_time_branch():
1272 "branch some trunk files, and later branch the rest"
1273 # See test-data/main-cvsrepos/proj/README.
1274 conv
= ensure_conversion('main')
1276 # First change on the branch, creating it
1277 conv
.logs
[25].check(sym_log_msg('B_SPLIT'), (
1278 ('/%(branches)s/B_SPLIT (from /%(trunk)s:24)', 'A'),
1279 ('/%(branches)s/B_SPLIT/partial-prune', 'D'),
1280 ('/%(branches)s/B_SPLIT/single-files', 'D'),
1281 ('/%(branches)s/B_SPLIT/proj/sub1/subsubB', 'D'),
1284 conv
.logs
[29].check('First change on branch B_SPLIT.', (
1285 ('/%(branches)s/B_SPLIT/proj/default', 'M'),
1286 ('/%(branches)s/B_SPLIT/proj/sub1/default', 'M'),
1287 ('/%(branches)s/B_SPLIT/proj/sub1/subsubA/default', 'M'),
1288 ('/%(branches)s/B_SPLIT/proj/sub2/default', 'M'),
1289 ('/%(branches)s/B_SPLIT/proj/sub2/subsubA/default', 'M'),
1292 # A trunk commit for the file which was not branched
1293 conv
.logs
[30].check('A trunk change to sub1/subsubB/default. '
1294 'This was committed about an', (
1295 ('/%(trunk)s/proj/sub1/subsubB/default', 'M'),
1298 # Add the file not already branched to the branch, with modification:w
1299 conv
.logs
[31].check(sym_log_msg('B_SPLIT'), (
1300 ('/%(branches)s/B_SPLIT/proj/sub1/subsubB '
1301 '(from /%(trunk)s/proj/sub1/subsubB:30)', 'A'),
1304 conv
.logs
[32].check('This change affects sub3/default and '
1305 'sub1/subsubB/default, on branch', (
1306 ('/%(branches)s/B_SPLIT/proj/sub1/subsubB/default', 'M'),
1307 ('/%(branches)s/B_SPLIT/proj/sub3/default', 'M'),
1311 @Cvs2SvnTestFunction
1312 def multiple_tags():
1313 "multiple tags referring to same revision"
1314 conv
= ensure_conversion('main')
1315 if not conv
.path_exists('tags', 'T_ALL_INITIAL_FILES', 'proj', 'default'):
1317 if not conv
.path_exists(
1318 'tags', 'T_ALL_INITIAL_FILES_BUT_ONE', 'proj', 'default'):
1322 @Cvs2SvnTestFunction
1323 def multiply_defined_symbols():
1324 "multiple definitions of symbol names"
1326 # We can only check one line of the error output at a time, so test
1327 # twice. (The conversion only have to be done once because the
1328 # results are cached.)
1329 conv
= ensure_conversion(
1330 'multiply-defined-symbols',
1332 r
"ERROR\: Multiple definitions of the symbol \'BRANCH\' .*\: "
1336 conv
= ensure_conversion(
1337 'multiply-defined-symbols',
1339 r
"ERROR\: Multiple definitions of the symbol \'TAG\' .*\: "
1345 @Cvs2SvnTestFunction
1346 def multiply_defined_symbols_renamed():
1347 "rename multiply defined symbols"
1349 conv
= ensure_conversion(
1350 'multiply-defined-symbols',
1351 options_file
='cvs2svn-rename.options',
1355 @Cvs2SvnTestFunction
1356 def multiply_defined_symbols_ignored():
1357 "ignore multiply defined symbols"
1359 conv
= ensure_conversion(
1360 'multiply-defined-symbols',
1361 options_file
='cvs2svn-ignore.options',
1365 @Cvs2SvnTestFunction
1366 def repeatedly_defined_symbols():
1367 "multiple identical definitions of symbol names"
1369 # If a symbol is defined multiple times but has the same value each
1370 # time, that should not be an error.
1372 conv
= ensure_conversion('repeatedly-defined-symbols')
1375 @Cvs2SvnTestFunction
1377 "conversion of invalid symbolic names"
1378 conv
= ensure_conversion('bogus-tag')
1381 @Cvs2SvnTestFunction
1382 def overlapping_branch():
1383 "ignore a file with a branch with two names"
1384 conv
= ensure_conversion('overlapping-branch')
1386 if not conv
.output_found('.*cannot also have name \'vendorB\''):
1389 conv
.logs
[2].check('imported', (
1390 ('/%(trunk)s/nonoverlapping-branch', 'A'),
1391 ('/%(trunk)s/overlapping-branch', 'A'),
1394 if len(conv
.logs
) != 2:
1398 class PhoenixBranch(Cvs2SvnTestCase
):
1399 "convert a branch file rooted in a 'dead' revision"
1401 def __init__(self
, **kw
):
1402 Cvs2SvnTestCase
.__init
__(self
, 'phoenix', **kw
)
1404 def run(self
, sbox
):
1405 conv
= self
.ensure_conversion()
1406 conv
.logs
[8].check('This file was supplied by Jack Moffitt', (
1407 ('/%(branches)s/volsung_20010721', 'A'),
1408 ('/%(branches)s/volsung_20010721/phoenix', 'A'),
1410 conv
.logs
[9].check('This file was supplied by Jack Moffitt', (
1411 ('/%(branches)s/volsung_20010721/phoenix', 'M'),
1415 ###TODO: We check for 4 changed paths here to accomodate creating tags
1416 ###and branches in rev 1, but that will change, so this will
1417 ###eventually change back.
1418 @Cvs2SvnTestFunction
1419 def ctrl_char_in_log():
1420 "handle a control char in a log message"
1421 # This was issue #1106.
1423 conv
= ensure_conversion('ctrl-char-in-log')
1424 conv
.logs
[rev
].check_changes((
1425 ('/%(trunk)s/ctrl-char-in-log', 'A'),
1427 if conv
.logs
[rev
].msg
.find('\x04') < 0:
1429 "Log message of 'ctrl-char-in-log,v' (rev 2) is wrong.")
1432 @Cvs2SvnTestFunction
1434 "handle tags rooted in a redeleted revision"
1435 conv
= ensure_conversion('overdead')
1438 class NoTrunkPrune(Cvs2SvnTestCase
):
1439 "ensure that trunk doesn't get pruned"
1441 def __init__(self
, **kw
):
1442 Cvs2SvnTestCase
.__init
__(self
, 'overdead', **kw
)
1444 def run(self
, sbox
):
1445 conv
= self
.ensure_conversion()
1446 for rev
in conv
.logs
.keys():
1447 rev_logs
= conv
.logs
[rev
]
1448 if rev_logs
.get_path_op('/%(trunk)s') == 'D':
1452 @Cvs2SvnTestFunction
1453 def double_delete():
1454 "file deleted twice, in the root of the repository"
1455 # This really tests several things: how we handle a file that's
1456 # removed (state 'dead') in two successive revisions; how we
1457 # handle a file in the root of the repository (there were some
1458 # bugs in cvs2svn's svn path construction for top-level files); and
1459 # the --no-prune option.
1460 conv
= ensure_conversion(
1461 'double-delete', args
=['--trunk-only', '--no-prune'])
1463 path
= '/%(trunk)s/twice-removed'
1465 conv
.logs
[rev
].check('Updated CVS', (
1468 conv
.logs
[rev
+ 1].check('Remove this file for the first time.', (
1471 conv
.logs
[rev
+ 2].check('Remove this file for the second time,', (
1475 @Cvs2SvnTestFunction
1477 "branch created from both trunk and another branch"
1478 # See test-data/split-branch-cvsrepos/README.
1480 # The conversion will fail if the bug is present, and
1481 # ensure_conversion will raise Failure.
1482 conv
= ensure_conversion('split-branch')
1485 @Cvs2SvnTestFunction
1486 def resync_misgroups():
1487 "resyncing should not misorder commit groups"
1488 # See test-data/resync-misgroups-cvsrepos/README.
1490 # The conversion will fail if the bug is present, and
1491 # ensure_conversion will raise Failure.
1492 conv
= ensure_conversion('resync-misgroups')
1495 class TaggedBranchAndTrunk(Cvs2SvnTestCase
):
1496 "allow tags with mixed trunk and branch sources"
1498 def __init__(self
, **kw
):
1499 Cvs2SvnTestCase
.__init
__(self
, 'tagged-branch-n-trunk', **kw
)
1501 def run(self
, sbox
):
1502 conv
= self
.ensure_conversion()
1504 tags
= conv
.symbols
.get('tags', 'tags')
1506 a_path
= conv
.get_wc(tags
, 'some-tag', 'a.txt')
1507 b_path
= conv
.get_wc(tags
, 'some-tag', 'b.txt')
1508 if not (os
.path
.exists(a_path
) and os
.path
.exists(b_path
)):
1510 if (open(a_path
, 'r').read().find('1.24') == -1) \
1511 or (open(b_path
, 'r').read().find('1.5') == -1):
1515 @Cvs2SvnTestFunction
1517 "never use the rev-in-progress as a copy source"
1519 # See issue #1427 and r8544.
1520 conv
= ensure_conversion('enroot-race')
1522 conv
.logs
[rev
].check_changes((
1523 ('/%(branches)s/mybranch (from /%(trunk)s:5)', 'A'),
1524 ('/%(branches)s/mybranch/proj/a.txt', 'D'),
1525 ('/%(branches)s/mybranch/proj/b.txt', 'D'),
1527 conv
.logs
[rev
+ 1].check_changes((
1528 ('/%(branches)s/mybranch/proj/c.txt', 'M'),
1529 ('/%(trunk)s/proj/a.txt', 'M'),
1530 ('/%(trunk)s/proj/b.txt', 'M'),
1534 @Cvs2SvnTestFunction
1535 def enroot_race_obo():
1536 "do use the last completed rev as a copy source"
1537 conv
= ensure_conversion('enroot-race-obo')
1538 conv
.logs
[3].check_change('/%(branches)s/BRANCH (from /%(trunk)s:2)', 'A')
1539 if not len(conv
.logs
) == 3:
1543 class BranchDeleteFirst(Cvs2SvnTestCase
):
1544 "correctly handle deletion as initial branch action"
1546 def __init__(self
, **kw
):
1547 Cvs2SvnTestCase
.__init
__(self
, 'branch-delete-first', **kw
)
1549 def run(self
, sbox
):
1550 # See test-data/branch-delete-first-cvsrepos/README.
1552 # The conversion will fail if the bug is present, and
1553 # ensure_conversion would raise Failure.
1554 conv
= self
.ensure_conversion()
1556 branches
= conv
.symbols
.get('branches', 'branches')
1558 # 'file' was deleted from branch-1 and branch-2, but not branch-3
1559 if conv
.path_exists(branches
, 'branch-1', 'file'):
1561 if conv
.path_exists(branches
, 'branch-2', 'file'):
1563 if not conv
.path_exists(branches
, 'branch-3', 'file'):
1567 @Cvs2SvnTestFunction
1568 def nonascii_filenames():
1569 "non ascii files converted incorrectly"
1572 # on a en_US.iso-8859-1 machine this test fails with
1573 # svn: Can't recode ...
1575 # as described in the issue
1577 # on a en_US.UTF-8 machine this test fails with
1578 # svn: Malformed XML ...
1580 # which means at least it fails. Unfortunately it won't fail
1581 # with the same error...
1583 # mangle current locale settings so we know we're not running
1584 # a UTF-8 locale (which does not exhibit this problem)
1585 current_locale
= locale
.getlocale()
1586 new_locale
= 'en_US.ISO8859-1'
1587 locale_changed
= None
1589 # From http://docs.python.org/lib/module-sys.html
1591 # getfilesystemencoding():
1593 # Return the name of the encoding used to convert Unicode filenames
1594 # into system file names, or None if the system default encoding is
1595 # used. The result value depends on the operating system:
1597 # - On Windows 9x, the encoding is ``mbcs''.
1598 # - On Mac OS X, the encoding is ``utf-8''.
1599 # - On Unix, the encoding is the user's preference according to the
1600 # result of nl_langinfo(CODESET), or None if the
1601 # nl_langinfo(CODESET) failed.
1602 # - On Windows NT+, file names are Unicode natively, so no conversion is
1605 # So we're going to skip this test on Mac OS X for now.
1606 if sys
.platform
== "darwin":
1607 raise svntest
.Skip()
1610 # change locale to non-UTF-8 locale to generate latin1 names
1611 locale
.setlocale(locale
.LC_ALL
, # this might be too broad?
1614 except locale
.Error
:
1615 raise svntest
.Skip()
1618 srcrepos_path
= os
.path
.join(test_data_dir
,'main-cvsrepos')
1619 dstrepos_path
= os
.path
.join(test_data_dir
,'non-ascii-cvsrepos')
1620 if not os
.path
.exists(dstrepos_path
):
1621 # create repos from existing main repos
1622 shutil
.copytree(srcrepos_path
, dstrepos_path
)
1623 base_path
= os
.path
.join(dstrepos_path
, 'single-files')
1624 shutil
.copyfile(os
.path
.join(base_path
, 'twoquick,v'),
1625 os
.path
.join(base_path
, 'two\366uick,v'))
1626 new_path
= os
.path
.join(dstrepos_path
, 'single\366files')
1627 os
.rename(base_path
, new_path
)
1629 conv
= ensure_conversion('non-ascii', args
=['--encoding=latin1'])
1632 locale
.setlocale(locale
.LC_ALL
, current_locale
)
1633 safe_rmtree(dstrepos_path
)
1636 class UnicodeTest(Cvs2SvnTestCase
):
1637 "metadata contains Unicode"
1639 warning_pattern
= r
'ERROR\: There were warnings converting .* messages'
1641 def __init__(self
, name
, warning_expected
, **kw
):
1642 if warning_expected
:
1643 error_re
= self
.warning_pattern
1647 Cvs2SvnTestCase
.__init
__(self
, name
, error_re
=error_re
, **kw
)
1648 self
.warning_expected
= warning_expected
1650 def run(self
, sbox
):
1652 # ensure the availability of the "utf_8" encoding:
1653 u
'a'.encode('utf_8').decode('utf_8')
1655 raise svntest
.Skip()
1657 self
.ensure_conversion()
1660 class UnicodeAuthor(UnicodeTest
):
1661 "author name contains Unicode"
1663 def __init__(self
, warning_expected
, **kw
):
1664 UnicodeTest
.__init
__(self
, 'unicode-author', warning_expected
, **kw
)
1667 class UnicodeLog(UnicodeTest
):
1668 "log message contains Unicode"
1670 def __init__(self
, warning_expected
, **kw
):
1671 UnicodeTest
.__init
__(self
, 'unicode-log', warning_expected
, **kw
)
1674 @Cvs2SvnTestFunction
1675 def vendor_branch_sameness():
1676 "avoid spurious changes for initial revs"
1677 conv
= ensure_conversion(
1678 'vendor-branch-sameness', args
=['--keep-trivial-imports']
1681 # The following files are in this repository:
1683 # a.txt: Imported in the traditional way; 1.1 and 1.1.1.1 have
1684 # the same contents, the file's default branch is 1.1.1,
1685 # and both revisions are in state 'Exp'.
1687 # b.txt: Like a.txt, except that 1.1.1.1 has a real change from
1688 # 1.1 (the addition of a line of text).
1690 # c.txt: Like a.txt, except that 1.1.1.1 is in state 'dead'.
1692 # d.txt: This file was created by 'cvs add' instead of import, so
1693 # it has only 1.1 -- no 1.1.1.1, and no default branch.
1694 # The timestamp on the add is exactly the same as for the
1695 # imports of the other files.
1697 # e.txt: Like a.txt, except that the log message for revision 1.1
1698 # is not the standard import log message.
1700 # (Aside from e.txt, the log messages for the same revisions are the
1701 # same in all files.)
1703 # We expect that only a.txt is recognized as an import whose 1.1
1704 # revision can be omitted. The other files should be added on trunk
1705 # then filled to vbranchA, whereas a.txt should be added to vbranchA
1706 # then copied to trunk. In the copy of 1.1.1.1 back to trunk, a.txt
1707 # and e.txt should be copied untouched; b.txt should be 'M'odified,
1708 # and c.txt should be 'D'eleted.
1711 conv
.logs
[rev
].check('Initial revision', (
1712 ('/%(trunk)s/proj', 'A'),
1713 ('/%(trunk)s/proj/b.txt', 'A'),
1714 ('/%(trunk)s/proj/c.txt', 'A'),
1715 ('/%(trunk)s/proj/d.txt', 'A'),
1718 conv
.logs
[rev
+ 1].check(sym_log_msg('vbranchA'), (
1719 ('/%(branches)s/vbranchA (from /%(trunk)s:2)', 'A'),
1720 ('/%(branches)s/vbranchA/proj/d.txt', 'D'),
1723 conv
.logs
[rev
+ 2].check('First vendor branch revision.', (
1724 ('/%(branches)s/vbranchA/proj/a.txt', 'A'),
1725 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1726 ('/%(branches)s/vbranchA/proj/c.txt', 'D'),
1729 conv
.logs
[rev
+ 3].check('This commit was generated by cvs2svn '
1730 'to compensate for changes in r4,', (
1731 ('/%(trunk)s/proj/a.txt (from /%(branches)s/vbranchA/proj/a.txt:4)', 'A'),
1732 ('/%(trunk)s/proj/b.txt (from /%(branches)s/vbranchA/proj/b.txt:4)', 'R'),
1733 ('/%(trunk)s/proj/c.txt', 'D'),
1737 conv
.logs
[rev
].check('This log message is not the standard', (
1738 ('/%(trunk)s/proj/e.txt', 'A'),
1741 conv
.logs
[rev
+ 2].check('First vendor branch revision', (
1742 ('/%(branches)s/vbranchB/proj/e.txt', 'M'),
1745 conv
.logs
[rev
+ 3].check('This commit was generated by cvs2svn '
1746 'to compensate for changes in r9,', (
1747 ('/%(trunk)s/proj/e.txt (from /%(branches)s/vbranchB/proj/e.txt:9)', 'R'),
1751 @Cvs2SvnTestFunction
1752 def vendor_branch_trunk_only():
1753 "handle vendor branches with --trunk-only"
1754 conv
= ensure_conversion('vendor-branch-sameness', args
=['--trunk-only'])
1757 conv
.logs
[rev
].check('Initial revision', (
1758 ('/%(trunk)s/proj', 'A'),
1759 ('/%(trunk)s/proj/b.txt', 'A'),
1760 ('/%(trunk)s/proj/c.txt', 'A'),
1761 ('/%(trunk)s/proj/d.txt', 'A'),
1764 conv
.logs
[rev
+ 1].check('First vendor branch revision', (
1765 ('/%(trunk)s/proj/a.txt', 'A'),
1766 ('/%(trunk)s/proj/b.txt', 'M'),
1767 ('/%(trunk)s/proj/c.txt', 'D'),
1770 conv
.logs
[rev
+ 2].check('This log message is not the standard', (
1771 ('/%(trunk)s/proj/e.txt', 'A'),
1774 conv
.logs
[rev
+ 3].check('First vendor branch revision', (
1775 ('/%(trunk)s/proj/e.txt', 'M'),
1779 @Cvs2SvnTestFunction
1780 def default_branches():
1781 "handle default branches correctly"
1782 conv
= ensure_conversion('default-branches')
1784 # There are seven files in the repository:
1787 # Imported in the traditional way, so 1.1 and 1.1.1.1 are the
1788 # same. Then 1.1.1.2 and 1.1.1.3 were imported, then 1.2
1789 # committed (thus losing the default branch "1.1.1"), then
1790 # 1.1.1.4 was imported. All vendor import release tags are
1794 # Like a.txt, but without rev 1.2.
1797 # Exactly like b.txt, just s/b.txt/c.txt/ in content.
1800 # Same as the previous two, but 1.1.1 branch is unlabeled.
1803 # Same, but missing 1.1.1 label and all tags but 1.1.1.3.
1805 # deleted-on-vendor-branch.txt,v:
1806 # Like b.txt and c.txt, except that 1.1.1.3 is state 'dead'.
1808 # added-then-imported.txt,v:
1809 # Added with 'cvs add' to create 1.1, then imported with
1810 # completely different contents to create 1.1.1.1, therefore
1811 # never had a default branch.
1814 conv
.logs
[2].check("Import (vbranchA, vtag-1).", (
1815 ('/%(branches)s/unlabeled-1.1.1', 'A'),
1816 ('/%(branches)s/unlabeled-1.1.1/proj', 'A'),
1817 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'A'),
1818 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'A'),
1819 ('/%(branches)s/vbranchA', 'A'),
1820 ('/%(branches)s/vbranchA/proj', 'A'),
1821 ('/%(branches)s/vbranchA/proj/a.txt', 'A'),
1822 ('/%(branches)s/vbranchA/proj/b.txt', 'A'),
1823 ('/%(branches)s/vbranchA/proj/c.txt', 'A'),
1824 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'A'),
1827 conv
.logs
[3].check("This commit was generated by cvs2svn "
1828 "to compensate for changes in r2,", (
1829 ('/%(trunk)s/proj', 'A'),
1830 ('/%(trunk)s/proj/a.txt (from /%(branches)s/vbranchA/proj/a.txt:2)', 'A'),
1831 ('/%(trunk)s/proj/b.txt (from /%(branches)s/vbranchA/proj/b.txt:2)', 'A'),
1832 ('/%(trunk)s/proj/c.txt (from /%(branches)s/vbranchA/proj/c.txt:2)', 'A'),
1833 ('/%(trunk)s/proj/d.txt '
1834 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:2)', 'A'),
1835 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt '
1836 '(from /%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt:2)', 'A'),
1837 ('/%(trunk)s/proj/e.txt '
1838 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:2)', 'A'),
1841 conv
.logs
[4].check(sym_log_msg('vtag-1',1), (
1842 ('/%(tags)s/vtag-1 (from /%(branches)s/vbranchA:2)', 'A'),
1843 ('/%(tags)s/vtag-1/proj/d.txt '
1844 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:2)', 'A'),
1847 conv
.logs
[5].check("Import (vbranchA, vtag-2).", (
1848 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'M'),
1849 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'M'),
1850 ('/%(branches)s/vbranchA/proj/a.txt', 'M'),
1851 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1852 ('/%(branches)s/vbranchA/proj/c.txt', 'M'),
1853 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'M'),
1856 conv
.logs
[6].check("This commit was generated by cvs2svn "
1857 "to compensate for changes in r5,", (
1858 ('/%(trunk)s/proj/a.txt '
1859 '(from /%(branches)s/vbranchA/proj/a.txt:5)', 'R'),
1860 ('/%(trunk)s/proj/b.txt '
1861 '(from /%(branches)s/vbranchA/proj/b.txt:5)', 'R'),
1862 ('/%(trunk)s/proj/c.txt '
1863 '(from /%(branches)s/vbranchA/proj/c.txt:5)', 'R'),
1864 ('/%(trunk)s/proj/d.txt '
1865 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:5)', 'R'),
1866 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt '
1867 '(from /%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt:5)',
1869 ('/%(trunk)s/proj/e.txt '
1870 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:5)', 'R'),
1873 conv
.logs
[7].check(sym_log_msg('vtag-2',1), (
1874 ('/%(tags)s/vtag-2 (from /%(branches)s/vbranchA:5)', 'A'),
1875 ('/%(tags)s/vtag-2/proj/d.txt '
1876 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:5)', 'A'),
1879 conv
.logs
[8].check("Import (vbranchA, vtag-3).", (
1880 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'M'),
1881 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'M'),
1882 ('/%(branches)s/vbranchA/proj/a.txt', 'M'),
1883 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1884 ('/%(branches)s/vbranchA/proj/c.txt', 'M'),
1885 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'D'),
1888 conv
.logs
[9].check("This commit was generated by cvs2svn "
1889 "to compensate for changes in r8,", (
1890 ('/%(trunk)s/proj/a.txt '
1891 '(from /%(branches)s/vbranchA/proj/a.txt:8)', 'R'),
1892 ('/%(trunk)s/proj/b.txt '
1893 '(from /%(branches)s/vbranchA/proj/b.txt:8)', 'R'),
1894 ('/%(trunk)s/proj/c.txt '
1895 '(from /%(branches)s/vbranchA/proj/c.txt:8)', 'R'),
1896 ('/%(trunk)s/proj/d.txt '
1897 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:8)', 'R'),
1898 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'D'),
1899 ('/%(trunk)s/proj/e.txt '
1900 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:8)', 'R'),
1903 conv
.logs
[10].check(sym_log_msg('vtag-3',1), (
1904 ('/%(tags)s/vtag-3 (from /%(branches)s/vbranchA:8)', 'A'),
1905 ('/%(tags)s/vtag-3/proj/d.txt '
1906 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:8)', 'A'),
1907 ('/%(tags)s/vtag-3/proj/e.txt '
1908 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:8)', 'A'),
1911 conv
.logs
[11].check("First regular commit, to a.txt, on vtag-3.", (
1912 ('/%(trunk)s/proj/a.txt', 'M'),
1915 conv
.logs
[12].check("Add a file to the working copy.", (
1916 ('/%(trunk)s/proj/added-then-imported.txt', 'A'),
1919 conv
.logs
[13].check(sym_log_msg('vbranchA'), (
1920 ('/%(branches)s/vbranchA/proj/added-then-imported.txt '
1921 '(from /%(trunk)s/proj/added-then-imported.txt:12)', 'A'),
1924 conv
.logs
[14].check("Import (vbranchA, vtag-4).", (
1925 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'M'),
1926 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'M'),
1927 ('/%(branches)s/vbranchA/proj/a.txt', 'M'),
1928 ('/%(branches)s/vbranchA/proj/added-then-imported.txt', 'M'), # CHECK!!!
1929 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1930 ('/%(branches)s/vbranchA/proj/c.txt', 'M'),
1931 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'A'),
1934 conv
.logs
[15].check("This commit was generated by cvs2svn "
1935 "to compensate for changes in r14,", (
1936 ('/%(trunk)s/proj/b.txt '
1937 '(from /%(branches)s/vbranchA/proj/b.txt:14)', 'R'),
1938 ('/%(trunk)s/proj/c.txt '
1939 '(from /%(branches)s/vbranchA/proj/c.txt:14)', 'R'),
1940 ('/%(trunk)s/proj/d.txt '
1941 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:14)', 'R'),
1942 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt '
1943 '(from /%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt:14)',
1945 ('/%(trunk)s/proj/e.txt '
1946 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:14)', 'R'),
1949 conv
.logs
[16].check(sym_log_msg('vtag-4',1), (
1950 ('/%(tags)s/vtag-4 (from /%(branches)s/vbranchA:14)', 'A'),
1951 ('/%(tags)s/vtag-4/proj/d.txt '
1952 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:14)', 'A'),
1956 @Cvs2SvnTestFunction
1957 def default_branches_trunk_only():
1958 "handle default branches with --trunk-only"
1960 conv
= ensure_conversion('default-branches', args
=['--trunk-only'])
1962 conv
.logs
[2].check("Import (vbranchA, vtag-1).", (
1963 ('/%(trunk)s/proj', 'A'),
1964 ('/%(trunk)s/proj/a.txt', 'A'),
1965 ('/%(trunk)s/proj/b.txt', 'A'),
1966 ('/%(trunk)s/proj/c.txt', 'A'),
1967 ('/%(trunk)s/proj/d.txt', 'A'),
1968 ('/%(trunk)s/proj/e.txt', 'A'),
1969 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'A'),
1972 conv
.logs
[3].check("Import (vbranchA, vtag-2).", (
1973 ('/%(trunk)s/proj/a.txt', 'M'),
1974 ('/%(trunk)s/proj/b.txt', 'M'),
1975 ('/%(trunk)s/proj/c.txt', 'M'),
1976 ('/%(trunk)s/proj/d.txt', 'M'),
1977 ('/%(trunk)s/proj/e.txt', 'M'),
1978 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'M'),
1981 conv
.logs
[4].check("Import (vbranchA, vtag-3).", (
1982 ('/%(trunk)s/proj/a.txt', 'M'),
1983 ('/%(trunk)s/proj/b.txt', 'M'),
1984 ('/%(trunk)s/proj/c.txt', 'M'),
1985 ('/%(trunk)s/proj/d.txt', 'M'),
1986 ('/%(trunk)s/proj/e.txt', 'M'),
1987 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'D'),
1990 conv
.logs
[5].check("First regular commit, to a.txt, on vtag-3.", (
1991 ('/%(trunk)s/proj/a.txt', 'M'),
1994 conv
.logs
[6].check("Add a file to the working copy.", (
1995 ('/%(trunk)s/proj/added-then-imported.txt', 'A'),
1998 conv
.logs
[7].check("Import (vbranchA, vtag-4).", (
1999 ('/%(trunk)s/proj/b.txt', 'M'),
2000 ('/%(trunk)s/proj/c.txt', 'M'),
2001 ('/%(trunk)s/proj/d.txt', 'M'),
2002 ('/%(trunk)s/proj/e.txt', 'M'),
2003 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'A'),
2007 @Cvs2SvnTestFunction
2008 def default_branch_and_1_2():
2009 "do not allow 1.2 revision with default branch"
2011 conv
= ensure_conversion(
2012 'default-branch-and-1-2',
2014 r
'.*File \'.*\' has default branch
=1\
.1\
.1 but also a revision
1\
.2'
2019 @Cvs2SvnTestFunction
2020 def compose_tag_three_sources():
2021 "compose a tag from three sources"
2022 conv = ensure_conversion('compose
-tag
-three
-sources
')
2024 conv.logs[2].check("Add on trunk", (
2025 ('/%(trunk)s/tagged
-on
-trunk
-1.1', 'A
'),
2026 ('/%(trunk)s/tagged
-on
-trunk
-1.2-a
', 'A
'),
2027 ('/%(trunk)s/tagged
-on
-trunk
-1.2-b
', 'A
'),
2028 ('/%(trunk)s/tagged
-on
-b1
', 'A
'),
2029 ('/%(trunk)s/tagged
-on
-b2
', 'A
'),
2032 conv.logs[3].check(sym_log_msg('b1
'), (
2033 ('/%(branches)s/b1 (from /%(trunk)s:2)', 'A
'),
2036 conv.logs[4].check(sym_log_msg('b2
'), (
2037 ('/%(branches)s/b2 (from /%(trunk)s:2)', 'A
'),
2040 conv.logs[5].check("Commit on branch b1", (
2041 ('/%(branches)s/b1
/tagged
-on
-trunk
-1.1', 'M
'),
2042 ('/%(branches)s/b1
/tagged
-on
-trunk
-1.2-a
', 'M
'),
2043 ('/%(branches)s/b1
/tagged
-on
-trunk
-1.2-b
', 'M
'),
2044 ('/%(branches)s/b1
/tagged
-on
-b1
', 'M
'),
2045 ('/%(branches)s/b1
/tagged
-on
-b2
', 'M
'),
2048 conv.logs[6].check("Commit on branch b2", (
2049 ('/%(branches)s/b2
/tagged
-on
-trunk
-1.1', 'M
'),
2050 ('/%(branches)s/b2
/tagged
-on
-trunk
-1.2-a
', 'M
'),
2051 ('/%(branches)s/b2
/tagged
-on
-trunk
-1.2-b
', 'M
'),
2052 ('/%(branches)s/b2
/tagged
-on
-b1
', 'M
'),
2053 ('/%(branches)s/b2
/tagged
-on
-b2
', 'M
'),
2056 conv.logs[7].check("Commit again on trunk", (
2057 ('/%(trunk)s/tagged
-on
-trunk
-1.2-a
', 'M
'),
2058 ('/%(trunk)s/tagged
-on
-trunk
-1.2-b
', 'M
'),
2059 ('/%(trunk)s/tagged
-on
-trunk
-1.1', 'M
'),
2060 ('/%(trunk)s/tagged
-on
-b1
', 'M
'),
2061 ('/%(trunk)s/tagged
-on
-b2
', 'M
'),
2064 conv.logs[8].check(sym_log_msg('T
',1), (
2065 ('/%(tags)s/T (from /%(trunk)s:7)', 'A
'),
2066 ('/%(tags)s/T
/tagged
-on
-trunk
-1.1 '
2067 '(from /%(trunk)s/tagged
-on
-trunk
-1.1:2)', 'R
'),
2068 ('/%(tags)s/T
/tagged
-on
-b1 (from /%(branches)s/b1
/tagged
-on
-b1
:5)', 'R
'),
2069 ('/%(tags)s/T
/tagged
-on
-b2 (from /%(branches)s/b2
/tagged
-on
-b2
:6)', 'R
'),
2073 @Cvs2SvnTestFunction
2074 def pass5_when_to_fill():
2075 "reserve a svn revnum for a fill only when required"
2076 # The conversion will fail if the bug is present, and
2077 # ensure_conversion would raise Failure.
2078 conv = ensure_conversion('pass5
-when
-to
-fill
')
2081 class EmptyTrunk(Cvs2SvnTestCase):
2082 "don't
break when the trunk
is empty
"
2084 def __init__(self, **kw):
2085 Cvs2SvnTestCase.__init__(self, 'empty-trunk', **kw)
2087 def run(self, sbox):
2088 # The conversion will fail if the bug is present, and
2089 # ensure_conversion would raise Failure.
2090 conv = self.ensure_conversion()
2093 @Cvs2SvnTestFunction
2094 def no_spurious_svn_commits():
2095 "ensure that we don
't create any spurious commits"
2096 conv = ensure_conversion('phoenix
')
2098 # Check spurious commit that could be created in
2099 # SVNCommitCreator._pre_commit()
2101 # (When you add a file on a branch, CVS creates a trunk revision
2102 # in state 'dead
'. If the log message of that commit is equal to
2103 # the one that CVS generates, we do not ever create a 'fill
'
2104 # SVNCommit for it.)
2106 # and spurious commit that could be created in
2107 # SVNCommitCreator._commit()
2109 # (When you add a file on a branch, CVS creates a trunk revision
2110 # in state 'dead
'. If the log message of that commit is equal to
2111 # the one that CVS generates, we do not create a primary SVNCommit
2113 conv.logs[17].check('File added on branch xiphophorus
', (
2114 ('/%(branches)s/xiphophorus
/added
-on
-branch
.txt
', 'A
'),
2117 # Check to make sure that a commit *is* generated:
2118 # (When you add a file on a branch, CVS creates a trunk revision
2119 # in state 'dead
'. If the log message of that commit is NOT equal
2120 # to the one that CVS generates, we create a primary SVNCommit to
2121 # serve as a home for the log message in question.
2122 conv.logs[18].check('file added
-on
-branch2
.txt was initially added on
'
2123 + 'branch xiphophorus
,\nand this log message was tweaked
', ())
2125 # Check spurious commit that could be created in
2126 # SVNCommitCreator._commit_symbols().
2127 conv.logs[19].check('This
file was also added on branch xiphophorus
,', (
2128 ('/%(branches)s/xiphophorus
/added
-on
-branch2
.txt
', 'A
'),
2132 class PeerPathPruning(Cvs2SvnTestCase):
2133 "make sure that filling prunes paths correctly"
2135 def __init__(self, **kw):
2136 Cvs2SvnTestCase.__init__(self, 'peer
-path
-pruning
', **kw)
2138 def run(self, sbox):
2139 conv = self.ensure_conversion()
2140 conv.logs[6].check(sym_log_msg('BRANCH
'), (
2141 ('/%(branches)s/BRANCH (from /%(trunk)s:4)', 'A
'),
2142 ('/%(branches)s/BRANCH
/bar
', 'D
'),
2143 ('/%(branches)s/BRANCH
/foo (from /%(trunk)s/foo
:5)', 'R
'),
2147 @Cvs2SvnTestFunction
2148 def invalid_closings_on_trunk():
2149 "verify correct revs are copied to default branches"
2150 # The conversion will fail if the bug is present, and
2151 # ensure_conversion would raise Failure.
2152 conv = ensure_conversion('invalid
-closings
-on
-trunk
')
2155 @Cvs2SvnTestFunction
2156 def individual_passes():
2157 "run each pass individually"
2158 conv = ensure_conversion('main
')
2159 conv2 = ensure_conversion('main
', passbypass=1)
2161 if conv.logs != conv2.logs:
2165 @Cvs2SvnTestFunction
2167 "reveal a big bug in our resync algorithm"
2168 # This will fail if the bug is present
2169 conv = ensure_conversion('resync
-bug
')
2172 @Cvs2SvnTestFunction
2173 def branch_from_default_branch():
2174 "reveal a bug in our default branch detection code"
2175 conv = ensure_conversion('branch
-from-default
-branch
')
2177 # This revision will be a default branch synchronization only
2178 # if cvs2svn is correctly determining default branch revisions.
2180 # The bug was that cvs2svn was treating revisions on branches off of
2181 # default branches as default branch revisions, resulting in
2182 # incorrectly regarding the branch off of the default branch as a
2183 # non-trunk default branch. Crystal clear? I thought so. See
2184 # issue #42 for more incoherent blathering.
2185 conv.logs[5].check("This commit was generated by cvs2svn", (
2186 ('/%(trunk)s/proj
/file.txt
'
2187 '(from /%(branches)s/upstream
/proj
/file.txt
:4)', 'R
'),
2191 @Cvs2SvnTestFunction
2192 def file_in_attic_too():
2193 "die if a file exists in and out of the attic"
2195 'file-in-attic
-too
',
2197 r'.*A CVS repository cannot contain both
'
2198 r'(.*)' + re.escape(os.sep) + r'(.*) '
2200 r'\
1' + re.escape(os.sep) + r'Attic
' + re.escape(os.sep) + r'\
2'
2205 @Cvs2SvnTestFunction
2206 def retain_file_in_attic_too():
2207 "test --retain-conflicting-attic-files option"
2208 conv = ensure_conversion(
2209 'file-in-attic
-too
', args=['--retain
-conflicting
-attic
-files
'])
2210 if not conv.path_exists('trunk
', 'file.txt
'):
2212 if not conv.path_exists('trunk
', 'Attic
', 'file.txt
'):
2216 @Cvs2SvnTestFunction
2217 def symbolic_name_filling_guide():
2218 "reveal a big bug in our SymbolFillingGuide"
2219 # This will fail if the bug is present
2220 conv = ensure_conversion('symbolic
-name
-overfill
')
2223 # Helpers for tests involving file contents and properties.
2225 class NodeTreeWalkException:
2226 "Exception class for node tree traversals."
2229 def node_for_path(node, path):
2230 "In the tree rooted under SVNTree NODE, return the node at PATH."
2231 if node.name != '__SVN_ROOT_NODE
':
2232 raise NodeTreeWalkException()
2233 path = path.strip('/')
2234 components = path.split('/')
2235 for component in components:
2236 node = svntest.tree.get_child(node, component)
2239 # Helper for tests involving properties.
2240 def props_for_path(node, path):
2241 "In the tree rooted under SVNTree NODE, return the prop dict for PATH."
2242 return node_for_path(node, path).props
2245 class EOLMime(Cvs2SvnPropertiesTestCase):
2246 """eol settings and mime types together
2248 The files are as follows:
2250 trunk/foo.txt: no -kb, mime file says nothing.
2251 trunk/foo.xml: no -kb, mime file says text.
2252 trunk/foo.zip: no -kb, mime file says non-text.
2253 trunk/foo.bin: has -kb, mime file says nothing.
2254 trunk/foo.csv: has -kb, mime file says text.
2255 trunk/foo.dbf: has -kb, mime file says non-text.
2258 def __init__(self, args, **kw):
2259 # TODO: It's a bit klugey to construct this path here
. But so far
2260 # there's only one test with a mime.types file. If we have more,
2261 # we should abstract this into some helper, which would be located
2262 # near ensure_conversion(). Note that it is a convention of this
2263 # test suite for a mime.types file to be located in the top level
2264 # of the CVS repository to which it applies.
2265 self
.mime_path
= os
.path
.join(
2266 test_data_dir
, 'eol-mime-cvsrepos', 'mime.types')
2268 Cvs2SvnPropertiesTestCase
.__init
__(
2270 props_to_test
=['svn:eol-style', 'svn:mime-type', 'svn:keywords'],
2271 args
=['--mime-types=%s' % self
.mime_path
] + args
,
2275 # We do four conversions. Each time, we pass --mime-types=FILE with
2276 # the same FILE, but vary --default-eol and --eol-from-mime-type.
2277 # Thus there's one conversion with neither flag, one with just the
2278 # former, one with just the latter, and one with both.
2281 # Neither --no-default-eol nor --eol-from-mime-type:
2282 eol_mime1
= EOLMime(
2286 ('trunk/foo.txt', [None, None, None]),
2287 ('trunk/foo.xml', [None, 'text/xml', None]),
2288 ('trunk/foo.zip', [None, 'application/zip', None]),
2289 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2290 ('trunk/foo.csv', [None, 'text/csv', None]),
2291 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2295 # Just --no-default-eol, not --eol-from-mime-type:
2296 eol_mime2
= EOLMime(
2298 args
=['--default-eol=native'],
2300 ('trunk/foo.txt', ['native', None, KEYWORDS
]),
2301 ('trunk/foo.xml', ['native', 'text/xml', KEYWORDS
]),
2302 ('trunk/foo.zip', ['native', 'application/zip', KEYWORDS
]),
2303 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2304 ('trunk/foo.csv', [None, 'text/csv', None]),
2305 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2309 # Just --eol-from-mime-type, not --no-default-eol:
2310 eol_mime3
= EOLMime(
2312 args
=['--eol-from-mime-type'],
2314 ('trunk/foo.txt', [None, None, None]),
2315 ('trunk/foo.xml', ['native', 'text/xml', KEYWORDS
]),
2316 ('trunk/foo.zip', [None, 'application/zip', None]),
2317 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2318 ('trunk/foo.csv', [None, 'text/csv', None]),
2319 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2323 # Both --no-default-eol and --eol-from-mime-type:
2324 eol_mime4
= EOLMime(
2326 args
=['--eol-from-mime-type', '--default-eol=native'],
2328 ('trunk/foo.txt', ['native', None, KEYWORDS
]),
2329 ('trunk/foo.xml', ['native', 'text/xml', KEYWORDS
]),
2330 ('trunk/foo.zip', [None, 'application/zip', None]),
2331 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2332 ('trunk/foo.csv', [None, 'text/csv', None]),
2333 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2337 cvs_revnums_off
= Cvs2SvnPropertiesTestCase(
2339 doc
='test non-setting of cvs2svn:cvs-rev property',
2341 props_to_test
=['cvs2svn:cvs-rev'],
2343 ('trunk/foo.txt', [None]),
2344 ('trunk/foo.xml', [None]),
2345 ('trunk/foo.zip', [None]),
2346 ('trunk/foo.bin', [None]),
2347 ('trunk/foo.csv', [None]),
2348 ('trunk/foo.dbf', [None]),
2352 cvs_revnums_on
= Cvs2SvnPropertiesTestCase(
2354 doc
='test setting of cvs2svn:cvs-rev property',
2355 args
=['--cvs-revnums'],
2356 props_to_test
=['cvs2svn:cvs-rev'],
2358 ('trunk/foo.txt', ['1.2']),
2359 ('trunk/foo.xml', ['1.2']),
2360 ('trunk/foo.zip', ['1.2']),
2361 ('trunk/foo.bin', ['1.2']),
2362 ('trunk/foo.csv', ['1.2']),
2363 ('trunk/foo.dbf', ['1.2']),
2367 keywords
= Cvs2SvnPropertiesTestCase(
2369 doc
='test setting of svn:keywords property among others',
2370 args
=['--default-eol=native'],
2371 props_to_test
=['svn:keywords', 'svn:eol-style', 'svn:mime-type'],
2373 ('trunk/foo.default', [KEYWORDS
, 'native', None]),
2374 ('trunk/foo.kkvl', [KEYWORDS
, 'native', None]),
2375 ('trunk/foo.kkv', [KEYWORDS
, 'native', None]),
2376 ('trunk/foo.kb', [None, None, 'application/octet-stream']),
2377 ('trunk/foo.kk', [None, 'native', None]),
2378 ('trunk/foo.ko', [None, 'native', None]),
2379 ('trunk/foo.kv', [None, 'native', None]),
2383 @Cvs2SvnTestFunction
2385 "test setting of svn:ignore property"
2386 conv
= ensure_conversion('cvsignore')
2387 wc_tree
= conv
.get_wc_tree()
2388 topdir_props
= props_for_path(wc_tree
, 'trunk/proj')
2389 subdir_props
= props_for_path(wc_tree
, '/trunk/proj/subdir')
2391 if topdir_props
['svn:ignore'] != \
2392 '*.idx\n*.aux\n*.dvi\n*.log\nfoo\nbar\nbaz\nqux\n':
2395 if subdir_props
['svn:ignore'] != \
2396 '*.idx\n*.aux\n*.dvi\n*.log\nfoo\nbar\nbaz\nqux\n':
2400 @Cvs2SvnTestFunction
2402 "test that CVS can still do what RCS can't"
2403 # See issues 4, 11, 29 for the bugs whose regression we're testing for.
2404 conv
= ensure_conversion(
2405 'requires-cvs', args
=['--use-cvs', '--default-eol=native'],
2408 atsign_contents
= file(conv
.get_wc("trunk", "atsign-add")).read()
2409 cl_contents
= file(conv
.get_wc("trunk", "client_lock.idl")).read()
2411 if atsign_contents
[-1:] == "@":
2413 if cl_contents
.find("gregh\n//\n//Integration for locks") < 0:
2416 if not (conv
.logs
[6].author
== "William Lyon Phelps III" and
2417 conv
.logs
[5].author
== "j random"):
2421 @Cvs2SvnTestFunction
2422 def questionable_branch_names():
2423 "test that we can handle weird branch names"
2424 conv
= ensure_conversion('questionable-symbols')
2425 # If the conversion succeeds, then we're okay. We could check the
2426 # actual branch paths, too, but the main thing is to know that the
2427 # conversion doesn't fail.
2430 @Cvs2SvnTestFunction
2431 def questionable_tag_names():
2432 "test that we can handle weird tag names"
2433 conv
= ensure_conversion('questionable-symbols')
2434 conv
.find_tag_log('Tag_A').check(sym_log_msg('Tag_A', 1), (
2435 ('/%(tags)s/Tag_A (from /trunk:8)', 'A'),
2437 conv
.find_tag_log('TagWith/Backslash_E').check(
2438 sym_log_msg('TagWith/Backslash_E',1),
2440 ('/%(tags)s/TagWith', 'A'),
2441 ('/%(tags)s/TagWith/Backslash_E (from /trunk:8)', 'A'),
2444 conv
.find_tag_log('TagWith/Slash_Z').check(
2445 sym_log_msg('TagWith/Slash_Z',1),
2447 ('/%(tags)s/TagWith/Slash_Z (from /trunk:8)', 'A'),
2452 @Cvs2SvnTestFunction
2453 def revision_reorder_bug():
2454 "reveal a bug that reorders file revisions"
2455 conv
= ensure_conversion('revision-reorder-bug')
2456 # If the conversion succeeds, then we're okay. We could check the
2457 # actual revisions, too, but the main thing is to know that the
2458 # conversion doesn't fail.
2461 @Cvs2SvnTestFunction
2463 "test that exclude really excludes everything"
2464 conv
= ensure_conversion('main', args
=['--exclude=.*'])
2465 for log
in conv
.logs
.values():
2466 for item
in log
.changed_paths
.keys():
2467 if item
.startswith('/branches/') or item
.startswith('/tags/'):
2471 @Cvs2SvnTestFunction
2472 def vendor_branch_delete_add():
2473 "add trunk file that was deleted on vendor branch"
2474 # This will error if the bug is present
2475 conv
= ensure_conversion('vendor-branch-delete-add')
2478 @Cvs2SvnTestFunction
2479 def resync_pass2_pull_forward():
2480 "ensure pass2 doesn't pull rev too far forward"
2481 conv
= ensure_conversion('resync-pass2-pull-forward')
2482 # If the conversion succeeds, then we're okay. We could check the
2483 # actual revisions, too, but the main thing is to know that the
2484 # conversion doesn't fail.
2487 @Cvs2SvnTestFunction
2489 "only LFs for svn:eol-style=native files"
2490 conv
= ensure_conversion('native-eol', args
=['--default-eol=native'])
2491 lines
= run_program(svntest
.main
.svnadmin_binary
, None, 'dump', '-q',
2493 # Verify that all files in the dump have LF EOLs. We're actually
2494 # testing the whole dump file, but the dump file itself only uses
2495 # LF EOLs, so we're safe.
2497 if line
[-1] != '\n' or line
[:-1].find('\r') != -1:
2501 @Cvs2SvnTestFunction
2503 "reveal a bug that created a branch twice"
2504 conv
= ensure_conversion('double-fill')
2505 # If the conversion succeeds, then we're okay. We could check the
2506 # actual revisions, too, but the main thing is to know that the
2507 # conversion doesn't fail.
2510 @Cvs2SvnTestFunction
2512 "reveal a second bug that created a branch twice"
2513 conv
= ensure_conversion('double-fill2')
2514 conv
.logs
[6].check_msg(sym_log_msg('BRANCH1'))
2515 conv
.logs
[7].check_msg(sym_log_msg('BRANCH2'))
2517 # This check should fail:
2518 conv
.logs
[8].check_msg(sym_log_msg('BRANCH2'))
2522 raise Failure('Symbol filled twice in a row')
2525 @Cvs2SvnTestFunction
2526 def resync_pass2_push_backward():
2527 "ensure pass2 doesn't push rev too far backward"
2528 conv
= ensure_conversion('resync-pass2-push-backward')
2529 # If the conversion succeeds, then we're okay. We could check the
2530 # actual revisions, too, but the main thing is to know that the
2531 # conversion doesn't fail.
2534 @Cvs2SvnTestFunction
2536 "reveal a bug that added a branch file twice"
2537 conv
= ensure_conversion('double-add')
2538 # If the conversion succeeds, then we're okay. We could check the
2539 # actual revisions, too, but the main thing is to know that the
2540 # conversion doesn't fail.
2543 @Cvs2SvnTestFunction
2544 def bogus_branch_copy():
2545 "reveal a bug that copies a branch file wrongly"
2546 conv
= ensure_conversion('bogus-branch-copy')
2547 # If the conversion succeeds, then we're okay. We could check the
2548 # actual revisions, too, but the main thing is to know that the
2549 # conversion doesn't fail.
2552 @Cvs2SvnTestFunction
2553 def nested_ttb_directories():
2554 "require error if ttb directories are not disjoint"
2556 {'trunk' : 'a', 'branches' : 'a',},
2557 {'trunk' : 'a', 'tags' : 'a',},
2558 {'branches' : 'a', 'tags' : 'a',},
2559 # This option conflicts with the default trunk path:
2560 {'branches' : 'trunk',},
2561 # Try some nested directories:
2562 {'trunk' : 'a', 'branches' : 'a/b',},
2563 {'trunk' : 'a/b', 'tags' : 'a/b/c/d',},
2564 {'branches' : 'a', 'tags' : 'a/b',},
2567 for opts
in opts_list
:
2569 'main', error_re
=r
'The following paths are not disjoint\:', **opts
2573 class AutoProps(Cvs2SvnPropertiesTestCase
):
2576 The files are as follows:
2578 trunk/foo.txt: no -kb, mime auto-prop says nothing.
2579 trunk/foo.xml: no -kb, mime auto-prop says text and eol-style=CRLF.
2580 trunk/foo.zip: no -kb, mime auto-prop says non-text.
2581 trunk/foo.asc: no -kb, mime auto-prop says text and eol-style=<unset>.
2582 trunk/foo.bin: has -kb, mime auto-prop says nothing.
2583 trunk/foo.csv: has -kb, mime auto-prop says text and eol-style=CRLF.
2584 trunk/foo.dbf: has -kb, mime auto-prop says non-text.
2585 trunk/foo.UPCASE1: no -kb, no mime type.
2586 trunk/foo.UPCASE2: no -kb, no mime type.
2589 def __init__(self
, args
, **kw
):
2590 ### TODO: It's a bit klugey to construct this path here. See also
2591 ### the comment in eol_mime().
2592 auto_props_path
= os
.path
.join(
2593 test_data_dir
, 'eol-mime-cvsrepos', 'auto-props')
2595 Cvs2SvnPropertiesTestCase
.__init
__(
2605 '--auto-props=%s' % auto_props_path
,
2606 '--eol-from-mime-type'
2611 auto_props_ignore_case
= AutoProps(
2612 doc
="test auto-props",
2613 args
=['--default-eol=native'],
2615 ('trunk/foo.txt', ['txt', 'native', None, KEYWORDS
, None]),
2616 ('trunk/foo.xml', ['xml', 'CRLF', 'text/xml', KEYWORDS
, None]),
2617 ('trunk/foo.zip', ['zip', None, 'application/zip', None, None]),
2618 ('trunk/foo.asc', ['asc', None, 'text/plain', None, None]),
2620 ['bin', None, 'application/octet-stream', None, '']),
2621 ('trunk/foo.csv', ['csv', 'CRLF', 'text/csv', None, None]),
2623 ['dbf', None, 'application/what-is-dbf', None, None]),
2624 ('trunk/foo.UPCASE1', ['UPCASE1', 'native', None, KEYWORDS
, None]),
2625 ('trunk/foo.UPCASE2', ['UPCASE2', 'native', None, KEYWORDS
, None]),
2629 @Cvs2SvnTestFunction
2630 def ctrl_char_in_filename():
2631 "do not allow control characters in filenames"
2634 srcrepos_path
= os
.path
.join(test_data_dir
,'main-cvsrepos')
2635 dstrepos_path
= os
.path
.join(test_data_dir
,'ctrl-char-filename-cvsrepos')
2636 if os
.path
.exists(dstrepos_path
):
2637 safe_rmtree(dstrepos_path
)
2639 # create repos from existing main repos
2640 shutil
.copytree(srcrepos_path
, dstrepos_path
)
2641 base_path
= os
.path
.join(dstrepos_path
, 'single-files')
2643 shutil
.copyfile(os
.path
.join(base_path
, 'twoquick,v'),
2644 os
.path
.join(base_path
, 'two\rquick,v'))
2646 # Operating systems that don't allow control characters in
2647 # filenames will hopefully have thrown an exception; in that
2648 # case, just skip this test.
2649 raise svntest
.Skip()
2651 conv
= ensure_conversion(
2652 'ctrl-char-filename',
2653 error_re
=(r
'.*Subversion does not allow character .*.'),
2656 safe_rmtree(dstrepos_path
)
2659 @Cvs2SvnTestFunction
2660 def commit_dependencies():
2661 "interleaved and multi-branch commits to same files"
2662 conv
= ensure_conversion("commit-dependencies")
2663 conv
.logs
[2].check('adding', (
2664 ('/%(trunk)s/interleaved', 'A'),
2665 ('/%(trunk)s/interleaved/file1', 'A'),
2666 ('/%(trunk)s/interleaved/file2', 'A'),
2668 conv
.logs
[3].check('big commit', (
2669 ('/%(trunk)s/interleaved/file1', 'M'),
2670 ('/%(trunk)s/interleaved/file2', 'M'),
2672 conv
.logs
[4].check('dependant small commit', (
2673 ('/%(trunk)s/interleaved/file1', 'M'),
2675 conv
.logs
[5].check('adding', (
2676 ('/%(trunk)s/multi-branch', 'A'),
2677 ('/%(trunk)s/multi-branch/file1', 'A'),
2678 ('/%(trunk)s/multi-branch/file2', 'A'),
2680 conv
.logs
[6].check(sym_log_msg("branch"), (
2681 ('/%(branches)s/branch (from /%(trunk)s:5)', 'A'),
2682 ('/%(branches)s/branch/interleaved', 'D'),
2684 conv
.logs
[7].check('multi-branch-commit', (
2685 ('/%(trunk)s/multi-branch/file1', 'M'),
2686 ('/%(trunk)s/multi-branch/file2', 'M'),
2687 ('/%(branches)s/branch/multi-branch/file1', 'M'),
2688 ('/%(branches)s/branch/multi-branch/file2', 'M'),
2692 @Cvs2SvnTestFunction
2693 def double_branch_delete():
2694 "fill branches before modifying files on them"
2695 conv
= ensure_conversion('double-branch-delete')
2697 # Test for issue #102. The file IMarshalledValue.java is branched,
2698 # deleted, readded on the branch, and then deleted again. If the
2699 # fill for the file on the branch is postponed until after the
2700 # modification, the file will end up live on the branch instead of
2701 # dead! Make sure it happens at the right time.
2703 conv
.logs
[6].check('JBAS-2436 - Adding LGPL Header2', (
2704 ('/%(branches)s/Branch_4_0/IMarshalledValue.java', 'A'),
2707 conv
.logs
[7].check('JBAS-3025 - Removing dependency', (
2708 ('/%(branches)s/Branch_4_0/IMarshalledValue.java', 'D'),
2712 @Cvs2SvnTestFunction
2713 def symbol_mismatches():
2714 "error for conflicting tag/branch"
2718 args
=['--symbol-default=strict'],
2719 error_re
=r
'.*Problems determining how symbols should be converted',
2723 @Cvs2SvnTestFunction
2724 def overlook_symbol_mismatches():
2725 "overlook conflicting tag/branch when --trunk-only"
2727 # This is a test for issue #85.
2729 ensure_conversion('symbol-mess', args
=['--trunk-only'])
2732 @Cvs2SvnTestFunction
2733 def force_symbols():
2734 "force symbols to be tags/branches"
2736 conv
= ensure_conversion(
2738 args
=['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG'])
2739 if conv
.path_exists('tags', 'BRANCH') \
2740 or not conv
.path_exists('branches', 'BRANCH'):
2742 if not conv
.path_exists('tags', 'TAG') \
2743 or conv
.path_exists('branches', 'TAG'):
2745 if conv
.path_exists('tags', 'MOSTLY_BRANCH') \
2746 or not conv
.path_exists('branches', 'MOSTLY_BRANCH'):
2748 if not conv
.path_exists('tags', 'MOSTLY_TAG') \
2749 or conv
.path_exists('branches', 'MOSTLY_TAG'):
2753 @Cvs2SvnTestFunction
2754 def commit_blocks_tags():
2755 "commit prevents forced tag"
2757 basic_args
= ['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG']
2760 args
=(basic_args
+ ['--force-tag=BRANCH_WITH_COMMIT']),
2762 r
'.*The following branches cannot be forced to be tags '
2763 r
'because they have commits'
2768 @Cvs2SvnTestFunction
2769 def blocked_excludes():
2770 "error for blocked excludes"
2772 basic_args
= ['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG']
2773 for blocker
in ['BRANCH', 'COMMIT', 'UNNAMED']:
2777 args
=(basic_args
+ ['--exclude=BLOCKED_BY_%s' % blocker
]))
2778 raise MissingErrorException()
2783 @Cvs2SvnTestFunction
2784 def unblock_blocked_excludes():
2785 "excluding blocker removes blockage"
2787 basic_args
= ['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG']
2788 for blocker
in ['BRANCH', 'COMMIT']:
2791 args
=(basic_args
+ ['--exclude=BLOCKED_BY_%s' % blocker
,
2792 '--exclude=BLOCKING_%s' % blocker
]))
2795 @Cvs2SvnTestFunction
2796 def regexp_force_symbols():
2797 "force symbols via regular expressions"
2799 conv
= ensure_conversion(
2801 args
=['--force-branch=MOST.*_BRANCH', '--force-tag=MOST.*_TAG'])
2802 if conv
.path_exists('tags', 'MOSTLY_BRANCH') \
2803 or not conv
.path_exists('branches', 'MOSTLY_BRANCH'):
2805 if not conv
.path_exists('tags', 'MOSTLY_TAG') \
2806 or conv
.path_exists('branches', 'MOSTLY_TAG'):
2810 @Cvs2SvnTestFunction
2811 def heuristic_symbol_default():
2812 "test 'heuristic' symbol default"
2814 conv
= ensure_conversion(
2815 'symbol-mess', args
=['--symbol-default=heuristic'])
2816 if conv
.path_exists('tags', 'MOSTLY_BRANCH') \
2817 or not conv
.path_exists('branches', 'MOSTLY_BRANCH'):
2819 if not conv
.path_exists('tags', 'MOSTLY_TAG') \
2820 or conv
.path_exists('branches', 'MOSTLY_TAG'):
2824 @Cvs2SvnTestFunction
2825 def branch_symbol_default():
2826 "test 'branch' symbol default"
2828 conv
= ensure_conversion(
2829 'symbol-mess', args
=['--symbol-default=branch'])
2830 if conv
.path_exists('tags', 'MOSTLY_BRANCH') \
2831 or not conv
.path_exists('branches', 'MOSTLY_BRANCH'):
2833 if conv
.path_exists('tags', 'MOSTLY_TAG') \
2834 or not conv
.path_exists('branches', 'MOSTLY_TAG'):
2838 @Cvs2SvnTestFunction
2839 def tag_symbol_default():
2840 "test 'tag' symbol default"
2842 conv
= ensure_conversion(
2843 'symbol-mess', args
=['--symbol-default=tag'])
2844 if not conv
.path_exists('tags', 'MOSTLY_BRANCH') \
2845 or conv
.path_exists('branches', 'MOSTLY_BRANCH'):
2847 if not conv
.path_exists('tags', 'MOSTLY_TAG') \
2848 or conv
.path_exists('branches', 'MOSTLY_TAG'):
2852 @Cvs2SvnTestFunction
2853 def symbol_transform():
2854 "test --symbol-transform"
2856 conv
= ensure_conversion(
2859 '--symbol-default=heuristic',
2860 '--symbol-transform=BRANCH:branch',
2861 '--symbol-transform=TAG:tag',
2862 '--symbol-transform=MOSTLY_(BRANCH|TAG):MOSTLY.\\1',
2864 if not conv
.path_exists('branches', 'branch'):
2866 if not conv
.path_exists('tags', 'tag'):
2868 if not conv
.path_exists('branches', 'MOSTLY.BRANCH'):
2870 if not conv
.path_exists('tags', 'MOSTLY.TAG'):
2874 @Cvs2SvnTestFunction
2875 def write_symbol_info():
2876 "test --write-symbol-info"
2880 'trunk', 'trunk', '.'],
2881 ['0', 'BLOCKED_BY_UNNAMED',
2882 'branch', 'branches/BLOCKED_BY_UNNAMED', '.trunk.'],
2883 ['0', 'BLOCKING_COMMIT',
2884 'branch', 'branches/BLOCKING_COMMIT', 'BLOCKED_BY_COMMIT'],
2885 ['0', 'BLOCKED_BY_COMMIT',
2886 'branch', 'branches/BLOCKED_BY_COMMIT', '.trunk.'],
2887 ['0', 'BLOCKING_BRANCH',
2888 'branch', 'branches/BLOCKING_BRANCH', 'BLOCKED_BY_BRANCH'],
2889 ['0', 'BLOCKED_BY_BRANCH',
2890 'branch', 'branches/BLOCKED_BY_BRANCH', '.trunk.'],
2891 ['0', 'MOSTLY_BRANCH',
2895 ['0', 'BRANCH_WITH_COMMIT',
2896 'branch', 'branches/BRANCH_WITH_COMMIT', '.trunk.'],
2898 'branch', 'branches/BRANCH', '.trunk.'],
2900 'tag', 'tags/TAG', '.trunk.'],
2901 ['0', 'unlabeled-1.1.12.1.2',
2902 'branch', 'branches/unlabeled-1.1.12.1.2', 'BLOCKED_BY_UNNAMED'],
2904 expected_lines
.sort()
2906 symbol_info_file
= os
.path
.join(tmp_dir
, 'symbol-mess-symbol-info.txt')
2911 '--symbol-default=strict',
2912 '--write-symbol-info=%s' % (symbol_info_file
,),
2913 '--passes=:CollateSymbolsPass',
2916 raise MissingErrorException()
2920 comment_re
= re
.compile(r
'^\s*\#')
2921 for l
in open(symbol_info_file
, 'r'):
2922 if comment_re
.match(l
):
2924 lines
.append(l
.strip().split())
2926 if lines
!= expected_lines
:
2927 s
= ['Symbol info incorrect\n']
2929 for diffline
in differ
.compare(
2930 [' '.join(line
) + '\n' for line
in expected_lines
],
2931 [' '.join(line
) + '\n' for line
in lines
],
2934 raise Failure(''.join(s
))
2937 @Cvs2SvnTestFunction
2939 "test --symbol-hints for setting branch/tag"
2941 conv
= ensure_conversion(
2942 'symbol-mess', symbol_hints_file
='symbol-mess-symbol-hints.txt',
2944 if not conv
.path_exists('branches', 'MOSTLY_BRANCH'):
2946 if not conv
.path_exists('tags', 'MOSTLY_TAG'):
2948 conv
.logs
[3].check(sym_log_msg('MOSTLY_TAG', 1), (
2949 ('/tags/MOSTLY_TAG (from /trunk:2)', 'A'),
2951 conv
.logs
[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
2952 ('/branches/BRANCH_WITH_COMMIT (from /trunk:2)', 'A'),
2954 conv
.logs
[10].check(sym_log_msg('MOSTLY_BRANCH'), (
2955 ('/branches/MOSTLY_BRANCH (from /trunk:2)', 'A'),
2959 @Cvs2SvnTestFunction
2961 "test --symbol-hints for setting parent"
2963 conv
= ensure_conversion(
2964 'symbol-mess', symbol_hints_file
='symbol-mess-parent-hints.txt',
2966 conv
.logs
[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
2967 ('/%(branches)s/BRANCH_WITH_COMMIT (from /branches/BRANCH:8)', 'A'),
2971 @Cvs2SvnTestFunction
2972 def parent_hints_invalid():
2973 "test --symbol-hints with an invalid parent"
2975 # BRANCH_WITH_COMMIT is usually determined to branch from .trunk.;
2976 # this symbol hints file sets the preferred parent to BRANCH
2978 conv
= ensure_conversion(
2979 'symbol-mess', symbol_hints_file
='symbol-mess-parent-hints-invalid.txt',
2981 r
"BLOCKED_BY_BRANCH is not a valid parent for BRANCH_WITH_COMMIT"
2986 @Cvs2SvnTestFunction
2987 def parent_hints_wildcards():
2988 "test --symbol-hints wildcards"
2990 # BRANCH_WITH_COMMIT is usually determined to branch from .trunk.;
2991 # this symbol hints file sets the preferred parent to BRANCH
2993 conv
= ensure_conversion(
2995 symbol_hints_file
='symbol-mess-parent-hints-wildcards.txt',
2997 conv
.logs
[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
2998 ('/%(branches)s/BRANCH_WITH_COMMIT (from /branches/BRANCH:8)', 'A'),
3002 @Cvs2SvnTestFunction
3004 "test --symbol-hints for setting svn paths"
3006 conv
= ensure_conversion(
3007 'symbol-mess', symbol_hints_file
='symbol-mess-path-hints.txt',
3009 conv
.logs
[1].check('Standard project directories initialized by cvs2svn.', (
3012 ('/a/strange', 'A'),
3013 ('/a/strange/trunk', 'A'),
3014 ('/a/strange/trunk/path', 'A'),
3018 conv
.logs
[3].check(sym_log_msg('MOSTLY_TAG', 1), (
3020 ('/special/tag', 'A'),
3021 ('/special/tag/path (from /a/strange/trunk/path:2)', 'A'),
3023 conv
.logs
[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
3024 ('/special/other', 'A'),
3025 ('/special/other/branch', 'A'),
3026 ('/special/other/branch/path (from /a/strange/trunk/path:2)', 'A'),
3028 conv
.logs
[10].check(sym_log_msg('MOSTLY_BRANCH'), (
3029 ('/special/branch', 'A'),
3030 ('/special/branch/path (from /a/strange/trunk/path:2)', 'A'),
3034 @Cvs2SvnTestFunction
3036 "test problem from issue 99"
3038 conv
= ensure_conversion('issue-99')
3041 @Cvs2SvnTestFunction
3043 "test problem from issue 100"
3045 conv
= ensure_conversion('issue-100')
3046 file1
= conv
.get_wc('trunk', 'file1.txt')
3047 if file(file1
).read() != 'file1.txt<1.2>\n':
3051 @Cvs2SvnTestFunction
3053 "test problem from issue 106"
3055 conv
= ensure_conversion('issue-106')
3058 @Cvs2SvnTestFunction
3059 def options_option():
3060 "use of the --options option"
3062 conv
= ensure_conversion('main', options_file
='cvs2svn.options')
3065 @Cvs2SvnTestFunction
3067 "multiproject conversion"
3069 conv
= ensure_conversion(
3070 'main', options_file
='cvs2svn-multiproject.options'
3072 conv
.logs
[1].check('Standard project directories initialized by cvs2svn.', (
3073 ('/partial-prune', 'A'),
3074 ('/partial-prune/trunk', 'A'),
3075 ('/partial-prune/branches', 'A'),
3076 ('/partial-prune/tags', 'A'),
3077 ('/partial-prune/releases', 'A'),
3081 @Cvs2SvnTestFunction
3083 "multiproject conversion with cross-project commits"
3085 conv
= ensure_conversion(
3086 'main', options_file
='cvs2svn-crossproject.options'
3090 @Cvs2SvnTestFunction
3091 def tag_with_no_revision():
3092 "tag defined but revision is deleted"
3094 conv
= ensure_conversion('tag-with-no-revision')
3097 @Cvs2SvnTestFunction
3098 def delete_cvsignore():
3099 "svn:ignore should vanish when .cvsignore does"
3101 # This is issue #81.
3103 conv
= ensure_conversion('delete-cvsignore')
3105 wc_tree
= conv
.get_wc_tree()
3106 props
= props_for_path(wc_tree
, 'trunk/proj')
3108 if props
.has_key('svn:ignore'):
3112 @Cvs2SvnTestFunction
3113 def repeated_deltatext():
3114 "ignore repeated deltatext blocks with warning"
3116 conv
= ensure_conversion('repeated-deltatext')
3117 warning_re
= r
'.*Deltatext block for revision 1.1 appeared twice'
3118 if not conv
.output_found(warning_re
):
3122 @Cvs2SvnTestFunction
3124 "process some nasty dependency graphs"
3126 # It's not how well the bear can dance, but that the bear can dance
3128 conv
= ensure_conversion('nasty-graphs')
3131 @Cvs2SvnTestFunction
3132 def tagging_after_delete():
3133 "optimal tag after deleting files"
3135 conv
= ensure_conversion('tagging-after-delete')
3137 # tag should be 'clean', no deletes
3138 log
= conv
.find_tag_log('tag1')
3140 ('/%(tags)s/tag1 (from /%(trunk)s:3)', 'A'),
3142 log
.check_changes(expected
)
3145 @Cvs2SvnTestFunction
3146 def crossed_branches():
3147 "branches created in inconsistent orders"
3149 conv
= ensure_conversion('crossed-branches')
3152 @Cvs2SvnTestFunction
3153 def file_directory_conflict():
3154 "error when filename conflicts with directory name"
3156 conv
= ensure_conversion(
3157 'file-directory-conflict',
3158 error_re
=r
'.*Directory name conflicts with filename',
3162 @Cvs2SvnTestFunction
3163 def attic_directory_conflict():
3164 "error when attic filename conflicts with dirname"
3166 # This tests the problem reported in issue #105.
3168 conv
= ensure_conversion(
3169 'attic-directory-conflict',
3170 error_re
=r
'.*Directory name conflicts with filename',
3174 @Cvs2SvnTestFunction
3176 "verify that --use-rcs and --use-internal-co agree"
3178 rcs_conv
= ensure_conversion(
3179 'main', args
=['--use-rcs', '--default-eol=native'],
3181 conv
= ensure_conversion(
3182 'main', args
=['--default-eol=native'],
3184 if conv
.output_found(r
'WARNING\: internal problem\: leftover revisions'):
3186 rcs_lines
= run_program(
3187 svntest
.main
.svnadmin_binary
, None, 'dump', '-q', '-r', '1:HEAD',
3189 lines
= run_program(
3190 svntest
.main
.svnadmin_binary
, None, 'dump', '-q', '-r', '1:HEAD',
3192 # Compare all lines following the repository UUID:
3193 if lines
[3:] != rcs_lines
[3:]:
3197 @Cvs2SvnTestFunction
3198 def internal_co_exclude():
3199 "verify that --use-internal-co --exclude=... works"
3201 rcs_conv
= ensure_conversion(
3203 args
=['--use-rcs', '--exclude=BRANCH', '--default-eol=native'],
3205 conv
= ensure_conversion(
3207 args
=['--exclude=BRANCH', '--default-eol=native'],
3209 if conv
.output_found(r
'WARNING\: internal problem\: leftover revisions'):
3211 rcs_lines
= run_program(
3212 svntest
.main
.svnadmin_binary
, None, 'dump', '-q', '-r', '1:HEAD',
3214 lines
= run_program(
3215 svntest
.main
.svnadmin_binary
, None, 'dump', '-q', '-r', '1:HEAD',
3217 # Compare all lines following the repository UUID:
3218 if lines
[3:] != rcs_lines
[3:]:
3222 @Cvs2SvnTestFunction
3223 def internal_co_trunk_only():
3224 "verify that --use-internal-co --trunk-only works"
3226 conv
= ensure_conversion(
3228 args
=['--trunk-only', '--default-eol=native'],
3230 if conv
.output_found(r
'WARNING\: internal problem\: leftover revisions'):
3234 @Cvs2SvnTestFunction
3235 def leftover_revs():
3236 "check for leftover checked-out revisions"
3238 conv
= ensure_conversion(
3240 args
=['--exclude=BRANCH', '--default-eol=native'],
3242 if conv
.output_found(r
'WARNING\: internal problem\: leftover revisions'):
3246 @Cvs2SvnTestFunction
3247 def requires_internal_co():
3248 "test that internal co can do more than RCS"
3249 # See issues 4, 11 for the bugs whose regression we're testing for.
3250 # Unlike in requires_cvs above, issue 29 is not covered.
3251 conv
= ensure_conversion('requires-cvs')
3253 atsign_contents
= file(conv
.get_wc("trunk", "atsign-add")).read()
3255 if atsign_contents
[-1:] == "@":
3258 if not (conv
.logs
[6].author
== "William Lyon Phelps III" and
3259 conv
.logs
[5].author
== "j random"):
3263 @Cvs2SvnTestFunction
3264 def internal_co_keywords():
3265 "test that internal co handles keywords correctly"
3266 conv_ic
= ensure_conversion('internal-co-keywords',
3267 args
=["--keywords-off"])
3268 conv_cvs
= ensure_conversion('internal-co-keywords',
3269 args
=["--use-cvs", "--keywords-off"])
3271 ko_ic
= file(conv_ic
.get_wc('trunk', 'dir', 'ko.txt')).read()
3272 ko_cvs
= file(conv_cvs
.get_wc('trunk', 'dir', 'ko.txt')).read()
3273 kk_ic
= file(conv_ic
.get_wc('trunk', 'dir', 'kk.txt')).read()
3274 kk_cvs
= file(conv_cvs
.get_wc('trunk', 'dir', 'kk.txt')).read()
3275 kv_ic
= file(conv_ic
.get_wc('trunk', 'dir', 'kv.txt')).read()
3276 kv_cvs
= file(conv_cvs
.get_wc('trunk', 'dir', 'kv.txt')).read()
3283 # The date format changed between cvs and co ('/' instead of '-').
3284 # Accept either one:
3285 date_substitution_re
= re
.compile(r
' ([0-9]*)-([0-9]*)-([0-9]*) ')
3286 if kv_ic
!= kv_cvs \
3287 and date_substitution_re
.sub(r
' \1/\2/\3 ', kv_ic
) != kv_cvs
:
3291 @Cvs2SvnTestFunction
3292 def timestamp_chaos():
3293 "test timestamp adjustments"
3295 conv
= ensure_conversion('timestamp-chaos', args
=["-v"])
3297 # The times are expressed here in UTC:
3299 '2007-01-01 21:00:00', # Initial commit
3300 '2007-01-01 21:00:00', # revision 1.1 of both files
3301 '2007-01-01 21:00:01', # revision 1.2 of file1.txt, adjusted forwards
3302 '2007-01-01 21:00:02', # revision 1.2 of file2.txt, adjusted backwards
3303 '2007-01-01 22:00:00', # revision 1.3 of both files
3306 # Convert the times to seconds since the epoch, in UTC:
3307 times
= [calendar
.timegm(svn_strptime(t
)) for t
in times
]
3309 for i
in range(len(times
)):
3310 if abs(conv
.logs
[i
+ 1].date
- times
[i
]) > 0.1:
3314 @Cvs2SvnTestFunction
3316 "convert a repository that contains symlinks"
3318 # This is a test for issue #97.
3320 proj
= os
.path
.join(test_data_dir
, 'symlinks-cvsrepos', 'proj')
3323 os
.path
.join('..', 'file.txt,v'),
3324 os
.path
.join(proj
, 'dir1', 'file.txt,v'),
3328 os
.path
.join(proj
, 'dir2'),
3334 except AttributeError:
3335 # Apparently this OS doesn't support symlinks, so skip test.
3336 raise svntest
.Skip()
3339 for (src
,dst
) in links
:
3340 os
.symlink(src
, dst
)
3342 conv
= ensure_conversion('symlinks')
3343 conv
.logs
[2].check('', (
3344 ('/%(trunk)s/proj', 'A'),
3345 ('/%(trunk)s/proj/file.txt', 'A'),
3346 ('/%(trunk)s/proj/dir1', 'A'),
3347 ('/%(trunk)s/proj/dir1/file.txt', 'A'),
3348 ('/%(trunk)s/proj/dir2', 'A'),
3349 ('/%(trunk)s/proj/dir2/file.txt', 'A'),
3352 for (src
,dst
) in links
:
3356 @Cvs2SvnTestFunction
3357 def empty_trunk_path():
3358 "allow --trunk to be empty if --trunk-only"
3360 # This is a test for issue #53.
3362 conv
= ensure_conversion(
3363 'main', args
=['--trunk-only', '--trunk='],
3367 @Cvs2SvnTestFunction
3368 def preferred_parent_cycle():
3369 "handle a cycle in branch parent preferences"
3371 conv
= ensure_conversion('preferred-parent-cycle')
3374 @Cvs2SvnTestFunction
3375 def branch_from_empty_dir():
3376 "branch from an empty directory"
3378 conv
= ensure_conversion('branch-from-empty-dir')
3381 @Cvs2SvnTestFunction
3383 "add a file on a branch then on trunk"
3385 conv
= ensure_conversion('trunk-readd')
3388 @Cvs2SvnTestFunction
3389 def branch_from_deleted_1_1():
3390 "branch from a 1.1 revision that will be deleted"
3392 conv
= ensure_conversion('branch-from-deleted-1-1')
3393 conv
.logs
[5].check('Adding b.txt:1.1.2.1', (
3394 ('/%(branches)s/BRANCH1/proj/b.txt', 'A'),
3396 conv
.logs
[6].check('Adding b.txt:1.1.4.1', (
3397 ('/%(branches)s/BRANCH2/proj/b.txt', 'A'),
3399 conv
.logs
[7].check('Adding b.txt:1.2', (
3400 ('/%(trunk)s/proj/b.txt', 'A'),
3403 conv
.logs
[8].check('Adding c.txt:1.1.2.1', (
3404 ('/%(branches)s/BRANCH1/proj/c.txt', 'A'),
3406 conv
.logs
[9].check('Adding c.txt:1.1.4.1', (
3407 ('/%(branches)s/BRANCH2/proj/c.txt', 'A'),
3411 @Cvs2SvnTestFunction
3412 def add_on_branch():
3413 "add a file on a branch using newer CVS"
3415 conv
= ensure_conversion('add-on-branch')
3416 conv
.logs
[6].check('Adding b.txt:1.1', (
3417 ('/%(trunk)s/proj/b.txt', 'A'),
3419 conv
.logs
[7].check('Adding b.txt:1.1.2.2', (
3420 ('/%(branches)s/BRANCH1/proj/b.txt', 'A'),
3422 conv
.logs
[8].check('Adding c.txt:1.1', (
3423 ('/%(trunk)s/proj/c.txt', 'A'),
3425 conv
.logs
[9].check('Removing c.txt:1.2', (
3426 ('/%(trunk)s/proj/c.txt', 'D'),
3428 conv
.logs
[10].check('Adding c.txt:1.2.2.2', (
3429 ('/%(branches)s/BRANCH2/proj/c.txt', 'A'),
3431 conv
.logs
[11].check('Adding d.txt:1.1', (
3432 ('/%(trunk)s/proj/d.txt', 'A'),
3434 conv
.logs
[12].check('Adding d.txt:1.1.2.2', (
3435 ('/%(branches)s/BRANCH3/proj/d.txt', 'A'),
3439 @Cvs2SvnTestFunction
3441 "test output in git-fast-import format"
3443 # Note: To test importing into git, do
3445 # ./run-tests <test-number>
3448 # cat cvs2svn-tmp/{blobfile,dumpfile}.out | git fast-import
3450 # Or, to load the dumpfiles separately:
3452 # cat cvs2svn-tmp/git-blob.dat \
3453 # | git fast-import --export-marks=cvs2svn-tmp/git-marks.dat
3454 # cat cvs2svn-tmp/git-dump.dat \
3455 # | git fast-import --import-marks=cvs2svn-tmp/git-marks.dat
3457 # Then use "gitk --all", "git log", etc. to test the contents of the
3460 # We don't have the infrastructure to check that the resulting git
3461 # repository is correct, so we just check that the conversion runs
3463 conv
= GitConversion('main', None, [
3464 '--blobfile=cvs2svn-tmp/blobfile.out',
3465 '--dumpfile=cvs2svn-tmp/dumpfile.out',
3466 '--username=cvs2git',
3467 'test-data/main-cvsrepos',
3471 @Cvs2SvnTestFunction
3473 "test cvs2git --use-external-blob-generator option"
3475 # See comment in main_git() for more information.
3477 conv
= GitConversion('main', None, [
3478 '--use-external-blob-generator',
3479 '--blobfile=cvs2svn-tmp/blobfile.out',
3480 '--dumpfile=cvs2svn-tmp/dumpfile.out',
3481 '--username=cvs2git',
3482 'test-data/main-cvsrepos',
3486 @Cvs2SvnTestFunction
3488 "test cvs2git using options file"
3490 conv
= GitConversion('main', None, [], options_file
='cvs2git.options')
3493 @Cvs2SvnTestFunction
3495 "output in git-fast-import format with inline data"
3497 # The output should be suitable for import by Mercurial.
3499 # We don't have the infrastructure to check that the resulting
3500 # Mercurial repository is correct, so we just check that the
3501 # conversion runs to completion:
3502 conv
= GitConversion('main', None, [], options_file
='cvs2hg.options')
3505 @Cvs2SvnTestFunction
3506 def invalid_symbol():
3507 "a symbol with the incorrect format"
3509 conv
= ensure_conversion('invalid-symbol')
3510 if not conv
.output_found(
3511 r
".*branch 'SYMBOL' references invalid revision 1$"
3516 @Cvs2SvnTestFunction
3517 def invalid_symbol_ignore():
3518 "ignore a symbol using a SymbolMapper"
3520 conv
= ensure_conversion(
3521 'invalid-symbol', options_file
='cvs2svn-ignore.options'
3525 @Cvs2SvnTestFunction
3526 def invalid_symbol_ignore2():
3527 "ignore a symbol using an IgnoreSymbolTransform"
3529 conv
= ensure_conversion(
3530 'invalid-symbol', options_file
='cvs2svn-ignore2.options'
3534 class EOLVariants(Cvs2SvnTestCase
):
3535 "handle various --eol-style options"
3537 eol_style_strings
= {
3544 def __init__(self
, eol_style
):
3545 self
.eol_style
= eol_style
3546 self
.dumpfile
= 'eol-variants-%s.dump' % (self
.eol_style
,)
3547 Cvs2SvnTestCase
.__init
__(
3548 self
, 'eol-variants', variant
=self
.eol_style
,
3549 dumpfile
=self
.dumpfile
,
3551 '--default-eol=%s' % (self
.eol_style
,),
3555 def run(self
, sbox
):
3556 conv
= self
.ensure_conversion()
3557 dump_contents
= open(conv
.dumpfile
, 'rb').read()
3558 expected_text
= self
.eol_style_strings
[self
.eol_style
].join(
3559 ['line 1', 'line 2', '\n\n']
3561 if not dump_contents
.endswith(expected_text
):
3565 @Cvs2SvnTestFunction
3567 "handle a file with no revisions (issue #80)"
3569 conv
= ensure_conversion('no-revs-file')
3572 @Cvs2SvnTestFunction
3573 def mirror_keyerror_test():
3574 "a case that gave KeyError in SVNRepositoryMirror"
3576 conv
= ensure_conversion('mirror-keyerror')
3579 @Cvs2SvnTestFunction
3580 def exclude_ntdb_test():
3581 "exclude a non-trunk default branch"
3583 symbol_info_file
= os
.path
.join(tmp_dir
, 'exclude-ntdb-symbol-info.txt')
3584 conv
= ensure_conversion(
3587 '--write-symbol-info=%s' % (symbol_info_file
,),
3588 '--exclude=branch3',
3590 '--exclude=vendortag3',
3591 '--exclude=vendorbranch',
3596 @Cvs2SvnTestFunction
3597 def mirror_keyerror2_test():
3598 "a case that gave KeyError in RepositoryMirror"
3600 conv
= ensure_conversion('mirror-keyerror2')
3603 @Cvs2SvnTestFunction
3604 def mirror_keyerror3_test():
3605 "a case that gave KeyError in RepositoryMirror"
3607 conv
= ensure_conversion('mirror-keyerror3')
3610 @Cvs2SvnTestFunction
3611 def add_cvsignore_to_branch_test():
3612 "check adding .cvsignore to an existing branch"
3614 # This a test for issue #122.
3616 conv
= ensure_conversion('add-cvsignore-to-branch')
3617 wc_tree
= conv
.get_wc_tree()
3618 trunk_props
= props_for_path(wc_tree
, 'trunk/dir')
3619 if trunk_props
['svn:ignore'] != '*.o\n\n':
3622 branch_props
= props_for_path(wc_tree
, 'branches/BRANCH/dir')
3623 if branch_props
['svn:ignore'] != '*.o\n\n':
3627 @Cvs2SvnTestFunction
3628 def missing_deltatext():
3629 "a revision's deltatext is missing"
3631 # This is a type of RCS file corruption that has been observed.
3632 conv
= ensure_conversion(
3633 'missing-deltatext',
3635 r
"ERROR\: .* has no deltatext section for revision 1\.1\.4\.4"
3640 @Cvs2SvnTestFunction
3641 def transform_unlabeled_branch_name():
3642 "transform name of unlabeled branch"
3644 conv
= ensure_conversion(
3647 '--symbol-transform=unlabeled-1.1.4:BRANCH2',
3650 if conv
.path_exists('branches', 'unlabeled-1.1.4'):
3651 raise Failure('Branch unlabeled-1.1.4 not excluded')
3652 if not conv
.path_exists('branches', 'BRANCH2'):
3653 raise Failure('Branch BRANCH2 not found')
3656 @Cvs2SvnTestFunction
3657 def ignore_unlabeled_branch():
3658 "ignoring an unlabeled branch is not allowed"
3660 conv
= ensure_conversion(
3662 options_file
='cvs2svn-ignore.options',
3664 r
"ERROR\: The unlabeled branch \'unlabeled\-1\.1\.4\' "
3665 r
"in \'.*\' contains commits"
3670 @Cvs2SvnTestFunction
3671 def exclude_unlabeled_branch():
3672 "exclude unlabeled branch"
3674 conv
= ensure_conversion(
3676 args
=['--exclude=unlabeled-.*'],
3678 if conv
.path_exists('branches', 'unlabeled-1.1.4'):
3679 raise Failure('Branch unlabeled-1.1.4 not excluded')
3682 @Cvs2SvnTestFunction
3683 def unlabeled_branch_name_collision():
3684 "transform unlabeled branch to same name as branch"
3686 conv
= ensure_conversion(
3689 '--symbol-transform=unlabeled-1.1.4:BRANCH',
3692 r
"ERROR\: Symbol name \'BRANCH\' is already used"
3697 @Cvs2SvnTestFunction
3698 def collision_with_unlabeled_branch_name():
3699 "transform branch to same name as unlabeled branch"
3701 conv
= ensure_conversion(
3704 '--symbol-transform=BRANCH:unlabeled-1.1.4',
3707 r
"ERROR\: Symbol name \'unlabeled\-1\.1\.4\' is already used"
3712 @Cvs2SvnTestFunction
3714 "a repo with many removable dead revisions"
3716 conv
= ensure_conversion('many-deletes')
3717 conv
.logs
[5].check('Add files on BRANCH', (
3718 ('/%(branches)s/BRANCH/proj/b.txt', 'A'),
3720 conv
.logs
[6].check('Add files on BRANCH2', (
3721 ('/%(branches)s/BRANCH2/proj/b.txt', 'A'),
3722 ('/%(branches)s/BRANCH2/proj/c.txt', 'A'),
3723 ('/%(branches)s/BRANCH2/proj/d.txt', 'A'),
3727 cvs_description
= Cvs2SvnPropertiesTestCase(
3729 doc
='test handling of CVS file descriptions',
3730 props_to_test
=['cvs:description'],
3732 ('trunk/proj/default', ['This is an example file description.']),
3733 ('trunk/proj/sub1/default', [None]),
3737 @Cvs2SvnTestFunction
3738 def include_empty_directories():
3739 "test --include-empty-directories option"
3741 conv
= ensure_conversion(
3742 'empty-directories', args
=['--include-empty-directories'],
3744 conv
.logs
[1].check('Standard project directories', (
3745 ('/%(trunk)s', 'A'),
3746 ('/%(branches)s', 'A'),
3748 ('/%(trunk)s/root-empty-directory', 'A'),
3749 ('/%(trunk)s/root-empty-directory/empty-subdirectory', 'A'),
3751 conv
.logs
[3].check('Add b.txt.', (
3752 ('/%(trunk)s/direct', 'A'),
3753 ('/%(trunk)s/direct/b.txt', 'A'),
3754 ('/%(trunk)s/direct/empty-directory', 'A'),
3755 ('/%(trunk)s/direct/empty-directory/empty-subdirectory', 'A'),
3757 conv
.logs
[4].check('Add c.txt.', (
3758 ('/%(trunk)s/indirect', 'A'),
3759 ('/%(trunk)s/indirect/subdirectory', 'A'),
3760 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3761 ('/%(trunk)s/indirect/empty-directory', 'A'),
3762 ('/%(trunk)s/indirect/empty-directory/empty-subdirectory', 'A'),
3764 conv
.logs
[5].check('Remove b.txt', (
3765 ('/%(trunk)s/direct', 'D'),
3767 conv
.logs
[6].check('Remove c.txt', (
3768 ('/%(trunk)s/indirect', 'D'),
3770 conv
.logs
[7].check('Re-add b.txt.', (
3771 ('/%(trunk)s/direct', 'A'),
3772 ('/%(trunk)s/direct/b.txt', 'A'),
3773 ('/%(trunk)s/direct/empty-directory', 'A'),
3774 ('/%(trunk)s/direct/empty-directory/empty-subdirectory', 'A'),
3776 conv
.logs
[8].check('Re-add c.txt.', (
3777 ('/%(trunk)s/indirect', 'A'),
3778 ('/%(trunk)s/indirect/subdirectory', 'A'),
3779 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3780 ('/%(trunk)s/indirect/empty-directory', 'A'),
3781 ('/%(trunk)s/indirect/empty-directory/empty-subdirectory', 'A'),
3783 conv
.logs
[9].check('This commit was manufactured', (
3784 ('/%(tags)s/TAG (from /%(trunk)s:8)', 'A'),
3786 conv
.logs
[10].check('This commit was manufactured', (
3787 ('/%(branches)s/BRANCH (from /%(trunk)s:8)', 'A'),
3789 conv
.logs
[11].check('Import d.txt.', (
3790 ('/%(branches)s/VENDORBRANCH', 'A'),
3791 ('/%(branches)s/VENDORBRANCH/import', 'A'),
3792 ('/%(branches)s/VENDORBRANCH/import/d.txt', 'A'),
3793 ('/%(branches)s/VENDORBRANCH/root-empty-directory', 'A'),
3794 ('/%(branches)s/VENDORBRANCH/root-empty-directory/empty-subdirectory',
3796 ('/%(branches)s/VENDORBRANCH/import/empty-directory', 'A'),
3797 ('/%(branches)s/VENDORBRANCH/import/empty-directory/empty-subdirectory',
3800 conv
.logs
[12].check('This commit was generated', (
3801 ('/%(trunk)s/import', 'A'),
3802 ('/%(trunk)s/import/d.txt '
3803 '(from /%(branches)s/VENDORBRANCH/import/d.txt:11)', 'A'),
3804 ('/%(trunk)s/import/empty-directory', 'A'),
3805 ('/%(trunk)s/import/empty-directory/empty-subdirectory', 'A'),
3809 @Cvs2SvnTestFunction
3810 def include_empty_directories_no_prune():
3811 "test --include-empty-directories with --no-prune"
3813 conv
= ensure_conversion(
3814 'empty-directories', args
=['--include-empty-directories', '--no-prune'],
3816 conv
.logs
[1].check('Standard project directories', (
3817 ('/%(trunk)s', 'A'),
3818 ('/%(branches)s', 'A'),
3820 ('/%(trunk)s/root-empty-directory', 'A'),
3821 ('/%(trunk)s/root-empty-directory/empty-subdirectory', 'A'),
3823 conv
.logs
[3].check('Add b.txt.', (
3824 ('/%(trunk)s/direct', 'A'),
3825 ('/%(trunk)s/direct/b.txt', 'A'),
3826 ('/%(trunk)s/direct/empty-directory', 'A'),
3827 ('/%(trunk)s/direct/empty-directory/empty-subdirectory', 'A'),
3829 conv
.logs
[4].check('Add c.txt.', (
3830 ('/%(trunk)s/indirect', 'A'),
3831 ('/%(trunk)s/indirect/subdirectory', 'A'),
3832 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3833 ('/%(trunk)s/indirect/empty-directory', 'A'),
3834 ('/%(trunk)s/indirect/empty-directory/empty-subdirectory', 'A'),
3836 conv
.logs
[5].check('Remove b.txt', (
3837 ('/%(trunk)s/direct/b.txt', 'D'),
3839 conv
.logs
[6].check('Remove c.txt', (
3840 ('/%(trunk)s/indirect/subdirectory/c.txt', 'D'),
3842 conv
.logs
[7].check('Re-add b.txt.', (
3843 ('/%(trunk)s/direct/b.txt', 'A'),
3845 conv
.logs
[8].check('Re-add c.txt.', (
3846 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3848 conv
.logs
[9].check('This commit was manufactured', (
3849 ('/%(tags)s/TAG (from /%(trunk)s:8)', 'A'),
3851 conv
.logs
[10].check('This commit was manufactured', (
3852 ('/%(branches)s/BRANCH (from /%(trunk)s:8)', 'A'),
3856 @Cvs2SvnTestFunction
3857 def exclude_symbol_default():
3858 "test 'exclude' symbol default"
3860 conv
= ensure_conversion(
3861 'symbol-mess', args
=['--symbol-default=exclude'])
3862 if conv
.path_exists('tags', 'MOSTLY_BRANCH') \
3863 or conv
.path_exists('branches', 'MOSTLY_BRANCH'):
3865 if conv
.path_exists('tags', 'MOSTLY_TAG') \
3866 or conv
.path_exists('branches', 'MOSTLY_TAG'):
3870 @Cvs2SvnTestFunction
3871 def add_on_branch2():
3872 "another add-on-branch test case"
3874 conv
= ensure_conversion('add-on-branch2')
3875 if len(conv
.logs
) != 2:
3877 conv
.logs
[2].check('add file on branch', (
3878 ('/%(branches)s/BRANCH', 'A'),
3879 ('/%(branches)s/BRANCH/file1', 'A'),
3883 @Cvs2SvnTestFunction
3884 def branch_from_vendor_branch():
3885 "branch from vendor branch"
3888 'branch-from-vendor-branch',
3889 symbol_hints_file
='branch-from-vendor-branch-symbol-hints.txt',
3893 @Cvs2SvnTestFunction
3894 def strange_default_branch():
3895 "default branch too deep in the hierarchy"
3898 'strange-default-branch',
3900 r
'ERROR\: The default branch 1\.2\.4\.3\.2\.1\.2 '
3901 r
'in file .* is not a top-level branch'
3906 @Cvs2SvnTestFunction
3908 "graft onto preferred parent that was itself moved"
3910 conv
= ensure_conversion(
3913 conv
.logs
[2].check('first', (
3914 ('/%(trunk)s/file1', 'A'),
3915 ('/%(trunk)s/file2', 'A'),
3917 conv
.logs
[3].check('This commit was manufactured', (
3918 ('/%(branches)s/b2 (from /%(trunk)s:2)', 'A'),
3920 conv
.logs
[4].check('second', (
3921 ('/%(branches)s/b2/file1', 'M'),
3923 conv
.logs
[5].check('This commit was manufactured', (
3924 ('/%(branches)s/b1 (from /%(branches)s/b2:4)', 'A'),
3927 # b2 and b1 are equally good parents for b3, so accept either one.
3928 # (Currently, cvs2svn chooses b1 as the preferred parent because it
3929 # comes earlier than b2 in alphabetical order.)
3931 conv
.logs
[6].check('This commit was manufactured', (
3932 ('/%(branches)s/b3 (from /%(branches)s/b1:5)', 'A'),
3935 conv
.logs
[6].check('This commit was manufactured', (
3936 ('/%(branches)s/b3 (from /%(branches)s/b2:4)', 'A'),
3940 ########################################################################
3943 # list all tests here, starting with None:
3950 XFail(cvs2hg_manpage
),
3955 PruneWithCare(variant
=1, trunk
='a', branches
='b', tags
='c'),
3957 PruneWithCare(variant
=2, trunk
='a/1', branches
='b/1', tags
='c/1'),
3958 PruneWithCare(variant
=3, trunk
='a/1', branches
='a/2', tags
='a/3'),
3959 interleaved_commits
,
3962 SimpleTags(variant
=1, trunk
='a', branches
='b', tags
='c'),
3963 SimpleTags(variant
=2, trunk
='a/1', branches
='b/1', tags
='c/1'),
3964 SimpleTags(variant
=3, trunk
='a/1', branches
='a/2', tags
='a/3'),
3965 simple_branch_commits
,
3968 mixed_time_branch_with_added_file
,
3974 PhoenixBranch(variant
=1, trunk
='a/1', branches
='b/1', tags
='c/1'),
3979 NoTrunkPrune(variant
=1, trunk
='a', branches
='b', tags
='c'),
3980 NoTrunkPrune(variant
=2, trunk
='a/1', branches
='b/1', tags
='c/1'),
3981 NoTrunkPrune(variant
=3, trunk
='a/1', branches
='a/2', tags
='a/3'),
3985 TaggedBranchAndTrunk(),
3986 TaggedBranchAndTrunk(variant
=1, trunk
='a/1', branches
='a/2', tags
='a/3'),
3990 BranchDeleteFirst(),
3991 BranchDeleteFirst(variant
=1, trunk
='a/1', branches
='a/2', tags
='a/3'),
3994 warning_expected
=1),
3997 variant
='encoding', args
=['--encoding=utf_8']),
4000 variant
='fallback-encoding', args
=['--fallback-encoding=utf_8']),
4002 warning_expected
=1),
4005 variant
='encoding', args
=['--encoding=utf_8']),
4008 variant
='fallback-encoding', args
=['--fallback-encoding=utf_8']),
4009 vendor_branch_sameness
,
4011 vendor_branch_trunk_only
,
4013 default_branches_trunk_only
,
4014 default_branch_and_1_2
,
4015 compose_tag_three_sources
,
4018 PeerPathPruning(variant
=1, trunk
='a/1', branches
='a/2', tags
='a/3'),
4020 EmptyTrunk(variant
=1, trunk
='a', branches
='b', tags
='c'),
4022 EmptyTrunk(variant
=2, trunk
='a/1', branches
='a/2', tags
='a/3'),
4023 no_spurious_svn_commits
,
4024 invalid_closings_on_trunk
,
4027 branch_from_default_branch
,
4029 retain_file_in_attic_too
,
4030 symbolic_name_filling_guide
,
4041 questionable_branch_names
,
4042 questionable_tag_names
,
4044 revision_reorder_bug
,
4046 vendor_branch_delete_add
,
4047 resync_pass2_pull_forward
,
4050 XFail(double_fill2
),
4051 resync_pass2_push_backward
,
4055 nested_ttb_directories
,
4056 auto_props_ignore_case
,
4057 ctrl_char_in_filename
,
4058 commit_dependencies
,
4061 multiply_defined_symbols
,
4062 multiply_defined_symbols_renamed
,
4063 multiply_defined_symbols_ignored
,
4064 repeatedly_defined_symbols
,
4066 double_branch_delete
,
4068 overlook_symbol_mismatches
,
4072 unblock_blocked_excludes
,
4073 regexp_force_symbols
,
4074 heuristic_symbol_default
,
4075 branch_symbol_default
,
4082 parent_hints_invalid
,
4083 parent_hints_wildcards
,
4092 tag_with_no_revision
,
4096 XFail(tagging_after_delete
),
4099 file_directory_conflict
,
4100 attic_directory_conflict
,
4102 internal_co_exclude
,
4103 internal_co_trunk_only
,
4104 internal_co_keywords
,
4106 requires_internal_co
,
4111 preferred_parent_cycle
,
4112 branch_from_empty_dir
,
4114 branch_from_deleted_1_1
,
4122 invalid_symbol_ignore
,
4123 invalid_symbol_ignore2
,
4126 EOLVariants('CRLF'),
4127 EOLVariants('native'),
4129 mirror_keyerror_test
,
4132 mirror_keyerror2_test
,
4133 mirror_keyerror3_test
,
4134 XFail(add_cvsignore_to_branch_test
),
4136 transform_unlabeled_branch_name
,
4137 ignore_unlabeled_branch
,
4138 exclude_unlabeled_branch
,
4139 unlabeled_branch_name_collision
,
4140 collision_with_unlabeled_branch_name
,
4144 include_empty_directories
,
4145 include_empty_directories_no_prune
,
4146 exclude_symbol_default
,
4148 XFail(branch_from_vendor_branch
),
4149 strange_default_branch
,
4153 if __name__
== '__main__':
4155 # Configure the environment for reproducable output from svn, etc.
4156 os
.environ
["LC_ALL"] = "C"
4158 # Unfortunately, there is no way under Windows to make Subversion
4159 # think that the local time zone is UTC, so we just work in the
4162 # The Subversion test suite code assumes it's being invoked from
4163 # within a working copy of the Subversion sources, and tries to use
4164 # the binaries in that tree. Since the cvs2svn tree never contains
4165 # a Subversion build, we just use the system's installed binaries.
4166 svntest
.main
.svn_binary
= svn_binary
4167 svntest
.main
.svnlook_binary
= svnlook_binary
4168 svntest
.main
.svnadmin_binary
= svnadmin_binary
4169 svntest
.main
.svnversion_binary
= svnversion_binary
4171 svntest
.main
.run_tests(test_list
)