| #!/usr/bin/env python |
| # |
| # log_tests.py: testing "svn log" |
| # |
| # Subversion is a tool for revision control. |
| # See http://subversion.tigris.org for more information. |
| # |
| # ==================================================================== |
| # Copyright (c) 2000-2008 CollabNet. All rights reserved. |
| # |
| # This software is licensed as described in the file COPYING, which |
| # you should have received as part of this distribution. The terms |
| # are also available at http://subversion.tigris.org/license-1.html. |
| # If newer versions of this license are posted there, you may use a |
| # newer version instead, at your option. |
| # |
| ###################################################################### |
| |
| # General modules |
| import re, os, sys |
| |
| # Our testing module |
| import svntest |
| from svntest import wc |
| |
| from svntest.main import server_has_mergeinfo |
| |
| ###################################################################### |
| # |
| # The Plan: |
| # |
| # Get a repository, commit about 6 or 7 revisions to it, each |
| # involving different kinds of operations. Make sure to have some |
| # add, del, mv, cp, as well as file modifications, and make sure that |
| # some files are modified more than once. |
| # |
| # Give each commit a recognizable log message. Test all combinations |
| # of -r options, including none. Then test with -v, which will |
| # (presumably) show changed paths as well. |
| # |
| ###################################################################### |
| |
| |
| |
| ###################################################################### |
| # Globals |
| # |
| |
| # These variables are set by guarantee_repos_and_wc(). |
| max_revision = 0 # Highest revision in the repos |
| |
| # What separates log msgs from one another in raw log output. |
| msg_separator = '------------------------------------' \ |
| + '------------------------------------\n' |
| |
| |
| # (abbreviation) |
| Skip = svntest.testcase.Skip |
| SkipUnless = svntest.testcase.SkipUnless |
| XFail = svntest.testcase.XFail |
| Item = svntest.wc.StateItem |
| |
| |
| ###################################################################### |
| # Utilities |
| # |
| |
| def guarantee_repos_and_wc(sbox): |
| "Make a repos and wc, commit max_revision revs." |
| global max_revision |
| |
| sbox.build() |
| wc_path = sbox.wc_dir |
| msg_file=os.path.join(sbox.repo_dir, 'log-msg') |
| msg_file=os.path.abspath(msg_file) |
| |
| # Now we have a repos and wc at revision 1. |
| |
| was_cwd = os.getcwd() |
| os.chdir(wc_path) |
| |
| # Set up the paths we'll be using most often. |
| iota_path = os.path.join('iota') |
| mu_path = os.path.join('A', 'mu') |
| B_path = os.path.join('A', 'B') |
| omega_path = os.path.join('A', 'D', 'H', 'omega') |
| pi_path = os.path.join('A', 'D', 'G', 'pi') |
| rho_path = os.path.join('A', 'D', 'G', 'rho') |
| alpha_path = os.path.join('A', 'B', 'E', 'alpha') |
| beta_path = os.path.join('A', 'B', 'E', 'beta') |
| psi_path = os.path.join('A', 'D', 'H', 'psi') |
| epsilon_path = os.path.join('A', 'C', 'epsilon') |
| |
| # Do a varied bunch of commits. No copies yet, we'll wait till Ben |
| # is done for that. |
| |
| # Revision 2: edit iota |
| msg=""" Log message for revision 2 |
| but with multiple lines |
| to test the code""" |
| svntest.main.file_write(msg_file, msg) |
| svntest.main.file_append(iota_path, "2") |
| svntest.main.run_svn(None, |
| 'ci', '-F', msg_file) |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 3: edit A/D/H/omega, A/D/G/pi, A/D/G/rho, and A/B/E/alpha |
| svntest.main.file_append(omega_path, "3") |
| svntest.main.file_append(pi_path, "3") |
| svntest.main.file_append(rho_path, "3") |
| svntest.main.file_append(alpha_path, "3") |
| svntest.main.run_svn(None, |
| 'ci', '-m', "Log message for revision 3") |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 4: edit iota again, add A/C/epsilon |
| msg=""" Log message for revision 4 |
| but with multiple lines |
| to test the code""" |
| svntest.main.file_write(msg_file, msg) |
| svntest.main.file_append(iota_path, "4") |
| svntest.main.file_append(epsilon_path, "4") |
| svntest.main.run_svn(None, 'add', epsilon_path) |
| svntest.main.run_svn(None, |
| 'ci', '-F', msg_file) |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 5: edit A/C/epsilon, delete A/D/G/rho |
| svntest.main.file_append(epsilon_path, "5") |
| svntest.main.run_svn(None, 'rm', rho_path) |
| svntest.main.run_svn(None, |
| 'ci', '-m', "Log message for revision 5") |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 6: prop change on A/B, edit A/D/H/psi |
| msg=""" Log message for revision 6 |
| but with multiple lines |
| to test the code""" |
| svntest.main.file_write(msg_file, msg) |
| svntest.main.run_svn(None, 'ps', 'blue', 'azul', B_path) |
| svntest.main.file_append(psi_path, "6") |
| svntest.main.run_svn(None, |
| 'ci', '-F', msg_file) |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 7: edit A/mu, prop change on A/mu |
| svntest.main.file_append(mu_path, "7") |
| svntest.main.run_svn(None, 'ps', 'red', 'burgundy', mu_path) |
| svntest.main.run_svn(None, |
| 'ci', '-m', "Log message for revision 7") |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 8: edit iota yet again, re-add A/D/G/rho |
| msg=""" Log message for revision 8 |
| but with multiple lines |
| to test the code""" |
| svntest.main.file_write(msg_file, msg) |
| svntest.main.file_append(iota_path, "8") |
| svntest.main.file_append(rho_path, "8") |
| svntest.main.run_svn(None, 'add', rho_path) |
| svntest.main.run_svn(None, |
| 'ci', '-F', msg_file) |
| svntest.main.run_svn(None, |
| 'up') |
| |
| # Revision 9: edit A/B/E/beta, delete A/B/E/alpha |
| svntest.main.file_append(beta_path, "9") |
| svntest.main.run_svn(None, 'rm', alpha_path) |
| svntest.main.run_svn(None, |
| 'ci', '-m', "Log message for revision 9") |
| svntest.main.run_svn(None, |
| 'up') |
| |
| max_revision = 9 |
| |
| # Restore. |
| os.chdir(was_cwd) |
| |
| # Let's run 'svn status' and make sure the working copy looks |
| # exactly the way we think it should. Start with a generic |
| # greek-tree-list, where every local and repos revision is at 9. |
| expected_status = svntest.actions.get_virginal_state(wc_path, 9) |
| expected_status.remove('A/B/E/alpha') |
| expected_status.add({ |
| 'A/C/epsilon' : Item(status=' ', wc_rev=9), |
| }) |
| |
| # props exist on A/B and A/mu |
| expected_status.tweak('A/B', 'A/mu', status=' ') |
| |
| # Run 'svn st -uv' and compare the actual results with our tree. |
| svntest.actions.run_and_verify_status(wc_path, expected_status) |
| |
| |
| def merge_history_repos(sbox): |
| """Make a repos with varied and interesting merge history, similar |
| to the repos found at: |
| http://merge-tracking.open.collab.net/servlets/ProjectProcess?documentContainer=c2__Sample%20repository""" |
| |
| upsilon_path = os.path.join('A', 'upsilon') |
| omicron_path = os.path.join('blocked', 'omicron') |
| branch_a = os.path.join('branches', 'a') |
| branch_b = os.path.join('branches', 'b') |
| branch_c = os.path.join('branches', 'c') |
| |
| # Create an empty repository - r0 |
| svntest.main.safe_rmtree(sbox.repo_dir, 1) |
| svntest.main.safe_rmtree(sbox.wc_dir, 1) |
| svntest.main.create_repos(sbox.repo_dir) |
| |
| svntest.actions.run_and_verify_svn(None, None, [], "co", sbox.repo_url, |
| sbox.wc_dir) |
| was_cwd = os.getcwd() |
| os.chdir(sbox.wc_dir) |
| |
| # Create trunk/tags/branches - r1 |
| svntest.main.run_svn(None, 'mkdir', 'trunk') |
| svntest.main.run_svn(None, 'mkdir', 'tags') |
| svntest.main.run_svn(None, 'mkdir', 'branches') |
| svntest.main.run_svn(None, 'ci', '-m', |
| 'Add trunk/tags/branches structure.') |
| |
| # Import greek tree to trunk - r2 |
| svntest.main.greek_state.write_to_disk('trunk') |
| svntest.main.run_svn(None, 'add', os.path.join('trunk', 'A'), |
| os.path.join('trunk', 'iota')) |
| svntest.main.run_svn(None, 'ci', '-m', |
| 'Import greek tree into trunk.') |
| |
| # Update from the repository to avoid a mix-rev working copy |
| svntest.main.run_svn(None, 'up') |
| |
| # Create a branch - r3 |
| svntest.main.run_svn(None, 'cp', 'trunk', branch_a) |
| svntest.main.run_svn(None, 'ci', '-m', |
| 'Create branches/a from trunk.') |
| |
| # Some changes on the branch - r4 |
| svntest.main.file_append(os.path.join(branch_a, 'iota'), |
| "'A' has changed a bit.\n") |
| svntest.main.file_append(os.path.join(branch_a, 'A', 'mu'), |
| "Don't forget to look at 'upsilon', too.") |
| svntest.main.file_write(os.path.join(branch_a, upsilon_path), |
| "This is the file 'upsilon'.\n") |
| svntest.main.run_svn(None, 'add', |
| os.path.join(branch_a, upsilon_path)) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Add the file 'upsilon', and change some other files.\n") |
| |
| # Create another branch - r5 |
| svntest.main.run_svn(None, 'cp', 'trunk', branch_c) |
| svntest.main.run_svn(None, 'ci', '-m', |
| 'Create branches/c from trunk.') |
| |
| # Do some mergeing - r6 |
| os.chdir('trunk') |
| svntest.main.run_svn(None, 'merge', os.path.join('..', branch_a)) |
| svntest.main.run_svn(None, 'ci', '-m', |
| 'Merged branches/a to trunk.') |
| os.chdir('..') |
| |
| # Add omicron to branches/a - r7 |
| svntest.main.run_svn(None, 'mkdir', os.path.join(branch_a, 'blocked')) |
| svntest.main.file_write(os.path.join(branch_a, omicron_path), |
| "This is the file 'omicron'.\n") |
| svntest.main.run_svn(None, 'add', |
| os.path.join(branch_a, omicron_path)) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Add omicron to branches/a. " + |
| "It will be blocked from merging in r8.") |
| |
| # Block r7 from being merged to trunk - r8 |
| os.chdir('trunk') |
| svntest.main.run_svn(None, 'merge', '--record-only', '-r6:7', |
| os.path.join('..', branch_a)) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Block r7 from merging to trunk.") |
| os.chdir('..') |
| |
| # Wording change in mu - r9 |
| svntest.main.file_write(os.path.join('trunk', 'A', 'mu'), |
| "This is the file 'mu'.\n" + |
| "Don't forget to look at 'upsilon', as well.") |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Wording change in mu.") |
| |
| # Update from the repository to avoid a mix-rev working copy |
| svntest.main.run_svn(None, 'up') |
| |
| # Create another branch - r10 |
| svntest.main.run_svn(None, 'cp', 'trunk', branch_b) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Create branches/b from trunk") |
| |
| # Add another file, make some changes on branches/a - r11 |
| svntest.main.file_append(os.path.join(branch_a, upsilon_path), |
| "There is also the file 'xi'.") |
| svntest.main.file_write(os.path.join(branch_a, 'A', 'xi'), |
| "This is the file 'xi'.\n") |
| svntest.main.run_svn(None, 'add', |
| os.path.join(branch_a, 'A', 'xi')) |
| svntest.main.file_write(os.path.join(branch_a, 'iota'), |
| "This is the file 'iota'.\n" + |
| "'A' has changed a bit, with 'upsilon', and 'xi'.") |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Added 'xi' to branches/a, made a few other changes.") |
| |
| # Merge branches/a to branches/b - r12 |
| os.chdir(branch_b) |
| svntest.main.run_svn(None, 'merge', os.path.join('..', 'a')) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Merged branches/a to branches/b.") |
| os.chdir(os.path.join('..', '..')) |
| |
| # More wording changes - r13 |
| svntest.main.file_append(os.path.join(branch_b, 'A', 'D', 'gamma'), |
| "Watch out for the rays!") |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Modify 'gamma' on branches/b.") |
| |
| # More merging - r14 |
| os.chdir('trunk') |
| svntest.main.run_svn(None, 'merge', os.path.join('..', branch_b)) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Merged branches/b to trunk.") |
| os.chdir('..') |
| |
| # Even more merging - r15 |
| os.chdir(branch_c) |
| svntest.main.run_svn(None, 'merge', os.path.join('..', '..', 'trunk')) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Bring branches/c up to date with trunk.") |
| os.chdir(os.path.join('..', '..')) |
| |
| # Modify a file on branches/c - r16 |
| svntest.main.file_append(os.path.join(branch_c, 'A', 'mu'), |
| "\nThis is yet more content in 'mu'.") |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Modify 'mu' on branches/c.") |
| |
| # Merge branches/c to trunk, which produces a conflict - r17 |
| os.chdir('trunk') |
| svntest.main.run_svn(None, 'merge', os.path.join('..', branch_c)) |
| svntest.main.file_write(os.path.join('A', 'mu'), |
| "This is the file 'mu'.\n" + |
| "Don't forget to look at 'upsilon', as well.\n" + |
| "This is yet more content in 'mu'.") |
| svntest.main.run_svn(None, 'resolved', os.path.join('A', 'mu')) |
| svntest.main.run_svn(None, 'ci', '-m', |
| "Merge branches/c to trunk, " + |
| "resolving a conflict in 'mu'.") |
| os.chdir('..') |
| |
| # Restore working directory |
| os.chdir(was_cwd) |
| |
| |
| # For errors seen while parsing log data. |
| class SVNLogParseError(Exception): |
| def __init__(self, args=None): |
| self.args = args |
| |
| |
| def parse_log_output(log_lines): |
| """Return a log chain derived from LOG_LINES. |
| A log chain is a list of hashes; each hash represents one log |
| message, in the order it appears in LOG_LINES (the first log |
| message in the data is also the first element of the list, and so |
| on). |
| |
| Each hash contains the following keys/values: |
| |
| 'revision' ===> number |
| 'author' ===> string |
| 'date' ===> string |
| 'msg' ===> string (the log message itself) |
| 'lines' ===> number (so that it may be checked against rev) |
| If LOG_LINES contains changed-path information, then the hash |
| also contains |
| |
| 'paths' ===> list of tuples of the form (X, PATH), where X is the |
| first column of verbose output, and PATH is the affected path. |
| |
| If LOG_LINES contains merge result information, then the hash also contains |
| |
| 'merges' ===> list of merging revisions that resulted in this log |
| being part of the list of messages. |
| """ |
| |
| # Here's some log output to look at while writing this function: |
| |
| # ------------------------------------------------------------------------ |
| # r5 | kfogel | Tue 6 Nov 2001 17:18:19 | 1 line |
| # |
| # Log message for revision 5. |
| # ------------------------------------------------------------------------ |
| # r4 | kfogel | Tue 6 Nov 2001 17:18:18 | 3 lines |
| # |
| # Log message for revision 4 |
| # but with multiple lines |
| # to test the code. |
| # ------------------------------------------------------------------------ |
| # r3 | kfogel | Tue 6 Nov 2001 17:18:17 | 1 line |
| # |
| # Log message for revision 3. |
| # ------------------------------------------------------------------------ |
| # r2 | kfogel | Tue 6 Nov 2001 17:18:16 | 3 lines |
| # |
| # Log message for revision 2 |
| # but with multiple lines |
| # to test the code. |
| # ------------------------------------------------------------------------ |
| # r1 | foo | Tue 6 Nov 2001 15:27:57 | 1 line |
| # |
| # Log message for revision 1. |
| # ------------------------------------------------------------------------ |
| |
| # Regular expression to match the header line of a log message, with |
| # these groups: (revision number), (author), (date), (num lines). |
| header_re = re.compile('^r([0-9]+) \| ' \ |
| + '([^|]*) \| ([^|]*) \| ([0-9]+) lines?') |
| |
| # The log chain to return. |
| chain = [] |
| |
| this_item = None |
| while 1: |
| try: |
| this_line = log_lines.pop(0) |
| except IndexError: |
| return chain |
| |
| match = header_re.search(this_line) |
| if match and match.groups(): |
| is_result = 0 |
| this_item = {} |
| this_item['revision'] = int(match.group(1)) |
| this_item['author'] = match.group(2) |
| this_item['date'] = match.group(3) |
| lines = int(match.group(4)) |
| this_item['lines'] = lines |
| |
| # Parse verbose output, starting with "Changed paths" |
| next_line = log_lines.pop(0) |
| if next_line.strip() == 'Changed paths:': |
| paths = [] |
| path_line = log_lines.pop(0).strip() |
| |
| # Stop on either a blank line or a "Result of a merge..." line |
| while path_line != '' and path_line[0:6] != 'Result': |
| paths.append( (path_line[0], path_line[2:]) ) |
| path_line = log_lines.pop(0).strip() |
| |
| this_item['paths'] = paths |
| |
| if path_line[0:6] == 'Result': |
| is_result = 1 |
| result_line = path_line |
| |
| elif next_line[0:6] == 'Result': |
| is_result = 1 |
| result_line = next_line.strip() |
| |
| # Parse output of "Result of a merge..." line |
| if is_result: |
| merges = [] |
| for rev_str in result_line[24:].split(','): |
| merges.append(int(rev_str.strip()[1:])) |
| this_item['merges'] = merges |
| |
| # Eat blank line |
| log_lines.pop(0) |
| |
| # Accumulate the log message |
| msg = '' |
| for line in log_lines[0:lines]: |
| msg += line |
| del log_lines[0:lines] |
| elif this_line == msg_separator: |
| if this_item: |
| this_item['msg'] = msg |
| chain.append(this_item) |
| else: # if didn't see separator now, then something's wrong |
| print this_line |
| raise SVNLogParseError, "trailing garbage after log message" |
| |
| return chain |
| |
| |
| class SVNUnexpectedLogs(svntest.Failure): |
| "Exception raised if a set of log messages doesn't meet expectations." |
| |
| def __init__(self, msg, chain, field_selector = 'revision'): |
| """Stores the log chain for later use. FIELD_SELECTOR indicates |
| which individual field to display when turning the exception into |
| text.""" |
| svntest.Failure.__init__(self, msg) |
| self.chain = chain |
| self.field_selector = field_selector |
| |
| def __str__(self): |
| msg = svntest.Failure.__str__(self) |
| if self.chain: |
| chain_data = list(self.chain) |
| for i in range(0, len(self.chain)): |
| chain_data[i] = self.chain[i][self.field_selector] |
| msg = msg + ': Actual %s list was %s' % (self.field_selector, chain_data) |
| return msg |
| |
| |
| def check_log_chain(chain, revlist, path_counts=[]): |
| """Verify that log chain CHAIN contains the right log messages for |
| revisions START to END (see documentation for parse_log_output() for |
| more about log chains). |
| |
| Do nothing if the log chain's messages run from revision START to END |
| and each log message contains a line of the form |
| |
| 'Log message for revision N' |
| |
| where N is the revision number of that commit. Verify that |
| author and date are present and look sane, but don't check them too |
| carefully. |
| Also verify that even numbered commit messages have three lines. |
| |
| If the length of PATH_COUNTS is greater than zero, make sure that each |
| log has that number of paths. |
| |
| Raise an error if anything looks wrong. |
| """ |
| |
| nbr_expected = len(revlist) |
| if len(chain) != nbr_expected: |
| raise SVNUnexpectedLogs('Number of elements in log chain and revision ' + |
| 'list %s not equal' % revlist, chain) |
| if path_counts and len(path_counts) != nbr_expected: |
| raise SVNUnexpectedLogs('Number of elements in log chain and path ' + |
| 'counts %s not equal' % path_counts, chain) |
| missing_revs = [] |
| for i in range(0, nbr_expected): |
| expect_rev = revlist[i] |
| log_item = chain[i] |
| saw_rev = log_item['revision'] |
| date = log_item['date'] |
| author = log_item['author'] |
| msg = log_item['msg'] |
| # The most important check is that the revision is right: |
| if expect_rev != saw_rev: |
| missing_revs.append(expect_rev) |
| continue |
| # Check that date looks at least vaguely right: |
| date_re = re.compile('[0-9]+') |
| if not date_re.search(date): |
| raise SVNUnexpectedLogs('Malformed date', chain, 'date') |
| # Authors are a little harder, since they might not exist over ra-dav. |
| # Well, it's not much of a check, but we'll do what we can. |
| author_re = re.compile('[a-zA-Z]+') |
| if (not (author_re.search(author) |
| or author == '' |
| or author == '(no author)')): |
| raise SVNUnexpectedLogs('Malformed author', chain, 'author') |
| |
| # Verify the expectation that even-numbered revisions in the Greek |
| # tree tweaked by the log tests have 3-line log messages. |
| if (saw_rev % 2 == 0 and log_item['lines'] != 3): |
| raise SVNUnexpectedLogs('Malformed log line counts', chain, 'lines') |
| |
| # Check that the log message looks right: |
| pattern = 'Log message for revision ' + `saw_rev` |
| msg_re = re.compile(pattern) |
| if not msg_re.search(msg): |
| raise SVNUnexpectedLogs("Malformed log message, expected '%s'" % msg, |
| chain) |
| |
| # If path_counts, check the number of changed paths |
| if path_counts: |
| if (not 'paths' in log_item) or (not log_item['paths']): |
| raise SVNUnexpectedLogs("No changed path information", chain) |
| if path_counts[i] != len(log_item['paths']): |
| raise SVNUnexpectedLogs("Changed paths counts not equal for " + |
| "revision %d" % (i + 1), chain) |
| |
| nbr_missing_revs = len(missing_revs) |
| if nbr_missing_revs > 0: |
| raise SVNUnexpectedLogs('Unable to find expected revision(s) %s' % |
| missing_revs, chain) |
| |
| |
| |
| ###################################################################### |
| # Tests |
| # |
| |
| #---------------------------------------------------------------------- |
| def plain_log(sbox): |
| "'svn log', no args, top of wc" |
| |
| guarantee_repos_and_wc(sbox) |
| |
| os.chdir(sbox.wc_dir) |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log') |
| |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, range(max_revision, 1 - 1, -1)) |
| |
| |
| #---------------------------------------------------------------------- |
| def log_with_empty_repos(sbox): |
| "'svn log' on an empty repository" |
| |
| # Create virgin repos |
| svntest.main.safe_rmtree(sbox.repo_dir, 1) |
| svntest.main.create_repos(sbox.repo_dir) |
| |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', |
| sbox.repo_url) |
| |
| #---------------------------------------------------------------------- |
| def log_where_nothing_changed(sbox): |
| "'svn log -rN some_dir_unchanged_in_N'" |
| sbox.build() |
| |
| # Fix bug whereby running 'svn log -rN SOMEPATH' would result in an |
| # xml protocol error if there were no changes in revision N |
| # underneath SOMEPATH. This problem was introduced in revision |
| # 3811, which didn't cover the case where svn_repos_get_logs might |
| # invoke log_receiver zero times. Since the receiver never ran, the |
| # lrb->needs_header flag never got cleared. Control would proceed |
| # without error to the end of dav_svn__log_report(), which would |
| # send a closing tag even though no opening tag had ever been sent. |
| |
| rho_path = os.path.join(sbox.wc_dir, 'A', 'D', 'G', 'rho') |
| svntest.main.file_append(rho_path, "some new material in rho") |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'ci', '-m', |
| 'log msg', rho_path) |
| |
| # Now run 'svn log -r2' on a directory unaffected by revision 2. |
| H_path = os.path.join(sbox.wc_dir, 'A', 'D', 'H') |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-r', '2', H_path) |
| |
| |
| #---------------------------------------------------------------------- |
| def log_to_revision_zero(sbox): |
| "'svn log -v -r 1:0 wc_root'" |
| sbox.build(read_only = True) |
| |
| # This used to segfault the server. |
| |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-v', |
| '-r', '1:0', sbox.wc_dir) |
| |
| #---------------------------------------------------------------------- |
| def log_with_path_args(sbox): |
| "'svn log', with args, top of wc" |
| |
| guarantee_repos_and_wc(sbox) |
| |
| os.chdir(sbox.wc_dir) |
| |
| output, err = svntest.actions.run_and_verify_svn( |
| None, None, [], |
| 'log', sbox.repo_url, 'A/D/G', 'A/D/H') |
| |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [8, 6, 5, 3, 1]) |
| |
| #---------------------------------------------------------------------- |
| def dynamic_revision(sbox): |
| "'svn log -r COMMITTED' of dynamic/local WC rev" |
| |
| guarantee_repos_and_wc(sbox) |
| os.chdir(sbox.wc_dir) |
| |
| revprops = [{'svn:author': 'jrandom', |
| 'svn:date': '', 'svn:log': 'Log message for revision 9'}] |
| for rev in ('HEAD', 'BASE', 'COMMITTED'): |
| svntest.actions.run_and_verify_log_xml(expected_revprops=revprops, |
| args=['-r', rev]) |
| revprops[0]['svn:log'] = ('Log message for revision 8\n' |
| ' but with multiple lines\n' |
| ' to test the code') |
| svntest.actions.run_and_verify_log_xml(expected_revprops=revprops, |
| args=['-r', 'PREV']) |
| |
| #---------------------------------------------------------------------- |
| def log_wc_with_peg_revision(sbox): |
| "'svn log wc_target@N'" |
| guarantee_repos_and_wc(sbox) |
| my_path = os.path.join(sbox.wc_dir, "A", "B", "E", "beta") + "@8" |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', my_path) |
| check_log_chain(parse_log_output(output), [1]) |
| |
| #---------------------------------------------------------------------- |
| def url_missing_in_head(sbox): |
| "'svn log target@N' when target removed from HEAD" |
| |
| guarantee_repos_and_wc(sbox) |
| |
| my_url = sbox.repo_url + "/A/B/E/alpha" + "@8" |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', my_url) |
| check_log_chain(parse_log_output(output), [3, 1]) |
| |
| #---------------------------------------------------------------------- |
| def log_through_copyfrom_history(sbox): |
| "'svn log TGT' with copyfrom history" |
| sbox.build() |
| wc_dir = sbox.wc_dir |
| msg_file=os.path.join(sbox.repo_dir, 'log-msg') |
| msg_file=os.path.abspath(msg_file) |
| |
| mu_path = os.path.join(wc_dir, 'A', 'mu') |
| mu2_path = os.path.join(wc_dir, 'A', 'mu2') |
| mu_URL = sbox.repo_url + '/A/mu' |
| mu2_URL = sbox.repo_url + '/A/mu2' |
| |
| msg2=""" Log message for revision 2 |
| but with multiple lines |
| to test the code""" |
| |
| msg4=""" Log message for revision 4 |
| but with multiple lines |
| to test the code""" |
| |
| msg6=""" Log message for revision 6 |
| but with multiple lines |
| to test the code""" |
| |
| svntest.main.file_write(msg_file, msg2) |
| svntest.main.file_append(mu_path, "2") |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'ci', wc_dir, |
| '-F', msg_file) |
| svntest.main.file_append(mu2_path, "this is mu2") |
| svntest.actions.run_and_verify_svn(None, None, [], 'add', mu2_path) |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'ci', wc_dir, |
| '-m', "Log message for revision 3") |
| svntest.actions.run_and_verify_svn(None, None, [], 'rm', mu2_path) |
| svntest.main.file_write(msg_file, msg4) |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'ci', wc_dir, |
| '-F', msg_file) |
| svntest.main.file_append(mu_path, "5") |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'ci', wc_dir, |
| '-m', "Log message for revision 5") |
| |
| svntest.main.file_write(msg_file, msg6) |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'cp', '-r', '5', mu_URL, mu2_URL, |
| '-F', msg_file) |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'up', wc_dir) |
| |
| # The full log for mu2 is relatively unsurprising |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', mu2_path) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [6, 5, 2, 1]) |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', mu2_URL) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [6, 5, 2, 1]) |
| |
| # First "oddity", the full log for mu2 doesn't include r3, but the -r3 |
| # log works! |
| peg_mu2_path = mu2_path + "@3" |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-r', '3', |
| peg_mu2_path) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [3]) |
| |
| peg_mu2_URL = mu2_URL + "@3" |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-r', '3', |
| peg_mu2_URL) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [3]) |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-r', '2', |
| mu2_path) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [2]) |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-r', '2', |
| mu2_URL) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [2]) |
| |
| #---------------------------------------------------------------------- |
| def escape_control_chars(sbox): |
| "mod_dav_svn must escape invalid XML control chars" |
| |
| dump_str = """SVN-fs-dump-format-version: 2 |
| |
| UUID: ffcae364-69ee-0310-a980-ca5f10462af2 |
| |
| Revision-number: 0 |
| Prop-content-length: 56 |
| Content-length: 56 |
| |
| K 8 |
| svn:date |
| V 27 |
| 2005-01-24T10:09:21.759592Z |
| PROPS-END |
| |
| Revision-number: 1 |
| Prop-content-length: 128 |
| Content-length: 128 |
| |
| K 7 |
| svn:log |
| V 100 |
| This msg contains a Ctrl-T (\x14) and a Ctrl-I (\t). |
| The former might be escaped, but the latter never. |
| |
| K 10 |
| svn:author |
| V 7 |
| jrandom |
| K 8 |
| svn:date |
| V 27 |
| 2005-01-24T10:09:22.012524Z |
| PROPS-END |
| """ |
| |
| # load dumpfile with control character into repos to get |
| # a log with control char content |
| svntest.actions.load_repo(sbox, dump_str=dump_str) |
| |
| URL = sbox.repo_url |
| |
| # run log |
| output, errput = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| URL) |
| |
| # Verify the output contains either the expected fuzzy escape |
| # sequence, or the literal control char. |
| match_unescaped_ctrl_re = "This msg contains a Ctrl-T \(.\) " \ |
| "and a Ctrl-I \(\t\)\." |
| match_escaped_ctrl_re = "^This msg contains a Ctrl-T \(\?\\\\020\) " \ |
| "and a Ctrl-I \(\t\)\." |
| matched = None |
| for line in output: |
| if re.match(match_unescaped_ctrl_re, line) \ |
| or re.match(match_escaped_ctrl_re, line): |
| matched = 1 |
| |
| if not matched: |
| raise svntest.Failure("log message not transmitted properly:" + |
| str(output) + "\n" + "error: " + str(errput)) |
| |
| #---------------------------------------------------------------------- |
| def log_xml_empty_date(sbox): |
| "svn log --xml must not print empty date elements" |
| sbox.build() |
| |
| # Create the revprop-change hook for this test |
| svntest.actions.enable_revprop_changes(sbox.repo_dir) |
| |
| date_re = re.compile('<date'); |
| |
| # Ensure that we get a date before we delete the property. |
| output, errput = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '--xml', '-r1', |
| sbox.wc_dir) |
| matched = 0 |
| for line in output: |
| if date_re.search(line): |
| matched = 1 |
| if not matched: |
| raise svntest.Failure("log contains no date element") |
| |
| # Set the svn:date revprop to the empty string on revision 1. |
| svntest.actions.run_and_verify_svn(None, None, [], |
| 'pdel', '--revprop', '-r1', 'svn:date', |
| sbox.wc_dir) |
| |
| output, errput = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '--xml', '-r1', |
| sbox.wc_dir) |
| for line in output: |
| if date_re.search(line): |
| raise svntest.Failure("log contains date element when svn:date is empty") |
| |
| #---------------------------------------------------------------------- |
| def log_limit(sbox): |
| "svn log --limit" |
| guarantee_repos_and_wc(sbox) |
| |
| out, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '--limit', '2', |
| sbox.repo_url) |
| log_chain = parse_log_output(out) |
| check_log_chain(log_chain, [9, 8]) |
| |
| out, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '--limit', '2', |
| sbox.repo_url, |
| 'A/B') |
| log_chain = parse_log_output(out) |
| check_log_chain(log_chain, [9, 6]) |
| |
| out, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '--limit', '2', |
| '--revision', '2:HEAD', |
| sbox.repo_url, |
| 'A/B') |
| log_chain = parse_log_output(out) |
| check_log_chain(log_chain, [3, 6]) |
| |
| # Use -l instead of --limit to test both option forms. |
| out, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', '-l', '2', |
| '--revision', '1', |
| sbox.repo_url, |
| 'A/B') |
| log_chain = parse_log_output(out) |
| check_log_chain(log_chain, [1]) |
| |
| must_be_positive = ".*Argument to --limit must be positive.*" |
| |
| # error expected when limit <= 0 |
| svntest.actions.run_and_verify_svn(None, None, must_be_positive, |
| 'log', '--limit', '0', '--revision', '1', |
| sbox.repo_url, 'A/B') |
| |
| svntest.actions.run_and_verify_svn(None, None, must_be_positive, |
| 'log', '--limit', '-1', '--revision', '1', |
| sbox.repo_url, 'A/B') |
| |
| def log_base_peg(sbox): |
| "run log on an @BASE target" |
| guarantee_repos_and_wc(sbox) |
| |
| target = os.path.join(sbox.wc_dir, 'A', 'B', 'E', 'beta') + '@BASE' |
| |
| out, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', target) |
| |
| log_chain = parse_log_output(out) |
| check_log_chain(log_chain, [9, 1]) |
| |
| svntest.actions.run_and_verify_svn(None, None, [], 'update', '-r', '1', |
| sbox.wc_dir) |
| |
| out, err = svntest.actions.run_and_verify_svn(None, None, [], |
| 'log', target) |
| |
| log_chain = parse_log_output(out) |
| check_log_chain(log_chain, [1]) |
| |
| |
| def log_verbose(sbox): |
| "run log with verbose output" |
| guarantee_repos_and_wc(sbox) |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-v', |
| sbox.wc_dir) |
| |
| log_chain = parse_log_output(output) |
| path_counts = [2, 2, 1, 2, 2, 2, 4, 1, 20] |
| check_log_chain(log_chain, range(max_revision, 1 - 1, -1), path_counts) |
| |
| |
| def log_parser(sbox): |
| "meta-test for the log parser" |
| |
| logs = ['''------------------------------------------------------------------------ |
| r24 | chuck | 2007-04-30 10:18:01 -0500 (Mon, 16 Apr 2007) | 1 line |
| Changed paths: |
| M /trunk/death-ray.c |
| M /trunk/frobnicator/frapnalyzer.c |
| |
| Merge r12 and r14 from branch to trunk. |
| ------------------------------------------------------------------------ |
| r14 | bob | 2007-04-16 18:50:29 -0500 (Mon, 16 Apr 2007) | 1 line |
| Changed paths: |
| M /trunk/death-ray.c |
| Result of a merge from: r24 |
| |
| Remove inadvertent changes to Death-Ray-o-Matic introduced in r12. |
| ------------------------------------------------------------------------ |
| r12 | alice | 2007-04-16 19:02:48 -0500 (Mon, 16 Apr 2007) | 1 line |
| Changed paths: |
| M /trunk/frobnicator/frapnalyzer.c |
| M /trunk/death-ray.c |
| Result of a merge from: r24 |
| |
| Fix frapnalyzer bug in frobnicator. |
| ------------------------------------------------------------------------''', |
| '''------------------------------------------------------------------------ |
| r24 | chuck | 2007-04-30 10:18:01 -0500 (Mon, 16 Apr 2007) | 1 line |
| |
| Merge r12 and r14 from branch to trunk. |
| ------------------------------------------------------------------------ |
| r14 | bob | 2007-04-16 18:50:29 -0500 (Mon, 16 Apr 2007) | 1 line |
| Result of a merge from: r24 |
| |
| Remove inadvertent changes to Death-Ray-o-Matic introduced in r12. |
| ------------------------------------------------------------------------ |
| r12 | alice | 2007-04-16 19:02:48 -0500 (Mon, 16 Apr 2007) | 1 line |
| Result of a merge from: r24 |
| |
| Fix frapnalyzer bug in frobnicator. |
| ------------------------------------------------------------------------ |
| r10 | alice | 2007-04-16 19:02:28 -0500 (Mon, 16 Apr 2007) | 1 line |
| Result of a merge from: r12, r24 |
| |
| Fix frapnalyzer documentation. |
| ------------------------------------------------------------------------ |
| r9 | bob | 2007-04-16 19:01:48 -0500 (Mon, 16 Apr 2007) | 1 line |
| Result of a merge from: r12, r24 |
| |
| Whitespace fixes. No functional change. |
| ------------------------------------------------------------------------''', |
| '''------------------------------------------------------------------------ |
| r5 | kfogel | Tue 6 Nov 2001 17:18:19 | 1 line |
| |
| Log message for revision 5. |
| ------------------------------------------------------------------------ |
| r4 | kfogel | Tue 6 Nov 2001 17:18:18 | 3 lines |
| |
| Log message for revision 4 |
| but with multiple lines |
| to test the code. |
| ------------------------------------------------------------------------ |
| r3 | kfogel | Tue 6 Nov 2001 17:18:17 | 1 line |
| |
| Log message for revision 3. |
| ------------------------------------------------------------------------''', |
| ] # end of log list |
| |
| for log in logs: |
| log_chain = parse_log_output([line+"\n" for line in log.split("\n")]) |
| |
| |
| def check_merge_results(log_chain, expected_merges): |
| '''Check LOG_CHAIN to see if the log information contains 'Result of Merge' |
| informaiton indicated by EXPECTED_MERGES. EXPECTED_MERGES is a dictionary |
| whose key is the merged revision, and whose value is the merging revision.''' |
| |
| # Check to see if the number and values of the revisions is correct |
| for log in log_chain: |
| if log['revision'] not in expected_merges: |
| raise SVNUnexpectedLogs("Found unexpected revision %d" % |
| log['revision'], log_chain) |
| |
| # Check to see that each rev in expected_merges contains the correct data |
| for rev in expected_merges: |
| try: |
| log = [x for x in log_chain if x['revision'] == rev][0] |
| if 'merges' in log.keys(): |
| actual = log['merges'] |
| else: |
| actual = [] |
| expected = expected_merges[rev] |
| |
| if actual != expected: |
| raise SVNUnexpectedLogs(("Merging revisions in rev %d not correct; " + |
| "expecting %s, found %s") % |
| (rev, str(expected), str(actual)), log_chain) |
| except IndexError: |
| raise SVNUnexpectedLogs("Merged revision '%d' missing" % rev, log_chain) |
| |
| |
| def merge_sensitive_log_single_revision(sbox): |
| "test sensitive log on a single revision" |
| |
| merge_history_repos(sbox) |
| |
| # Paths we care about |
| wc_dir = sbox.wc_dir |
| TRUNK_path = os.path.join(wc_dir, "trunk") |
| BRANCH_B_path = os.path.join(wc_dir, "branches", "b") |
| |
| # Run the merge sensitive log, and compare results |
| saved_cwd = os.getcwd() |
| |
| os.chdir(TRUNK_path) |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-g', '-r14') |
| |
| log_chain = parse_log_output(output) |
| expected_merges = { |
| 14: [], 13 : [14], 12 : [14], 11 : [14, 12], |
| } |
| check_merge_results(log_chain, expected_merges) |
| |
| os.chdir(saved_cwd) |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-g', '-r12', BRANCH_B_path) |
| log_chain = parse_log_output(output) |
| expected_merges = { |
| 12: [], 11 : [12], |
| } |
| check_merge_results(log_chain, expected_merges) |
| |
| |
| def merge_sensitive_log_branching_revision(sbox): |
| "test 'svn log -g' on a branching revision" |
| |
| merge_history_repos(sbox) |
| |
| # Paths we care about |
| wc_dir = sbox.wc_dir |
| BRANCH_B_path = os.path.join(wc_dir, "branches", "b") |
| |
| # Run log on a copying revision |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-g', '-r10', BRANCH_B_path) |
| |
| # Parse and check output. There should be no extra revisions. |
| log_chain = parse_log_output(output) |
| expected_merges = { |
| 10: [], |
| } |
| check_merge_results(log_chain, expected_merges) |
| |
| |
| def merge_sensitive_log_non_branching_revision(sbox): |
| "test 'svn log -g' on a non-branching revision" |
| |
| merge_history_repos(sbox) |
| |
| TRUNK_path = os.path.join(sbox.wc_dir, "trunk") |
| |
| # Run log on a non-copying revision that adds mergeinfo |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-g', '-r6', TRUNK_path) |
| |
| # Parse and check output. There should be one extra revision. |
| log_chain = parse_log_output(output) |
| expected_merges = { |
| 6: [], 4 : [6], |
| } |
| check_merge_results(log_chain, expected_merges) |
| |
| |
| def merge_sensitive_log_added_path(sbox): |
| "test 'svn log -g' a path added before merge" |
| |
| merge_history_repos(sbox) |
| |
| XI_path = os.path.join(sbox.wc_dir, "trunk", "A", "xi") |
| |
| # Run log on a non-copying revision that adds mergeinfo |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-g', XI_path) |
| |
| # Parse and check output. There should be one extra revision. |
| log_chain = parse_log_output(output) |
| expected_merges = { |
| 14: [], 12 : [], 11 : [], |
| } |
| check_merge_results(log_chain, expected_merges) |
| |
| revprops = [{'svn:author': 'jrandom', 'svn:date': '', |
| 'svn:log': 'Merged branches/b to trunk.'}, |
| {'svn:author': 'jrandom', 'svn:date': '', |
| 'svn:log': 'Merged branches/a to branches/b.'}, |
| {'svn:author': 'jrandom', 'svn:date': '', |
| 'svn:log': "Added 'xi' to branches/a," |
| ' made a few other changes.'}] |
| svntest.actions.run_and_verify_log_xml(expected_revprops=revprops, |
| args=['-g', XI_path]) |
| |
| |
| def log_single_change(sbox): |
| "test log -c for a single change" |
| |
| guarantee_repos_and_wc(sbox) |
| repo_url = sbox.repo_url |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-c', 4, repo_url) |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [4]) |
| |
| def log_changes_range(sbox): |
| "test log -c on range of changes" |
| |
| guarantee_repos_and_wc(sbox) |
| repo_url = sbox.repo_url |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-c', '2:5', repo_url) |
| |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [2, 3, 4, 5]) |
| |
| def log_changes_list(sbox): |
| "test log -c on comma-separated list of changes" |
| |
| guarantee_repos_and_wc(sbox) |
| repo_url = sbox.repo_url |
| |
| output, err = svntest.actions.run_and_verify_svn(None, None, [], 'log', |
| '-c', '2,5,7', repo_url) |
| |
| log_chain = parse_log_output(output) |
| check_log_chain(log_chain, [2, 5, 7]) |
| |
| #---------------------------------------------------------------------- |
| def only_one_wc_path(sbox): |
| "svn log of two wc paths is disallowed" |
| |
| sbox.build(read_only = True) |
| os.chdir(sbox.wc_dir) |
| |
| svntest.actions.run_and_verify_log_xml( |
| expected_stderr=('.*When specifying working copy paths,' |
| ' only one target may be given'), |
| args=['A/mu', 'iota']) |
| |
| #---------------------------------------------------------------------- |
| def retrieve_revprops(sbox): |
| "test revprop retrieval" |
| |
| sbox.build() |
| svntest.actions.enable_revprop_changes(sbox.repo_dir) |
| |
| # test properties |
| author = 'jrandom' |
| msg1 = 'Log message for revision 1.' |
| msg2 = 'Log message for revision 2.' |
| custom_name = 'retrieve_revprops' |
| custom_value = 'foo bar' |
| |
| # Commit a change. |
| wc_dir = sbox.wc_dir |
| cwd = os.getcwd() |
| os.chdir(wc_dir) |
| svntest.main.file_append(os.path.join('A', 'D', 'H', 'omega'), "new otext") |
| os.chdir(cwd) |
| omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega') |
| expected_output = svntest.wc.State(wc_dir, { |
| 'A/D/H/omega' : Item(verb='Sending'), |
| }) |
| expected_status = svntest.actions.get_virginal_state(wc_dir, 1) |
| expected_status.tweak('A/D/H/omega', wc_rev=2, status=' ') |
| svntest.actions.run_and_verify_commit(wc_dir, |
| expected_output, |
| expected_status, |
| None, |
| '-m', msg2, |
| omega_path) |
| |
| os.chdir(wc_dir) |
| |
| # Set custom property on r1 and r2. |
| svntest.actions.run_and_verify_svn( |
| None, None, [], # message, expected_stdout, expected_stderr |
| 'ps', '--revprop', '-r1', custom_name, custom_value, sbox.repo_url) |
| svntest.actions.run_and_verify_svn( |
| None, None, [], # message, expected_stdout, expected_stderr |
| 'ps', '--revprop', '-r2', custom_name, custom_value, sbox.repo_url) |
| |
| # Can't set revprops with log. |
| svntest.actions.run_and_verify_log_xml( |
| expected_stderr=(".*cannot assign with 'with-revprop' option" |
| " \(drop the '='\)"), |
| args=['--with-revprop=foo=bar']) |
| |
| # basic test without revprop options |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{'svn:author': author, 'svn:date': '', 'svn:log': msg1}], |
| args=['-r1']) |
| |
| # basic test without revprop options, with multiple revisions |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{'svn:author': author, 'svn:date': '', 'svn:log': msg1}, |
| {'svn:author': author, 'svn:date': '', 'svn:log': msg2}]) |
| |
| # -q with no revprop options must suppress svn:log only. |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{'svn:author': author, 'svn:date': ''}], |
| args=['-q', '-r1']) |
| |
| # Request svn:date, svn:log, and a non-existent property. |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{'svn:date': '', 'svn:log': msg1}], |
| args=['-r1', '--with-revprop=svn:date', '--with-revprop', 'svn:log', |
| '--with-revprop', 'nosuchprop']) |
| |
| # Get all revprops. |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{'svn:author': author, 'svn:date': '', |
| 'svn:log': msg1, custom_name: custom_value}], |
| args=['-r1', '--with-all-revprops']) |
| |
| # Get all revprops, with multiple revisions. |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{'svn:author': author, 'svn:date': '', |
| 'svn:log': msg1, custom_name: custom_value}, |
| {'svn:author': author, 'svn:date': '', |
| 'svn:log': msg2, custom_name: custom_value}], |
| args=['--with-all-revprops']) |
| |
| # Get only the custom property. |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=[{custom_name: custom_value}], |
| args=['-r1', '--with-revprop', custom_name]) |
| |
| |
| def log_xml_with_bad_data(sbox): |
| "log --xml escapes non-utf8 data (issue #2866)" |
| svntest.actions.load_repo(sbox, os.path.join(os.path.dirname(sys.argv[0]), |
| 'log_tests_data', |
| 'xml-invalid-chars.dump')) |
| r0_props = { |
| 'svn:date' : '', |
| 'svn:log' : 'After the colon are a space, 3 bad chars, ' |
| + '2 good chars, and a period: ' |
| + '?\\021?\\022?\\017\t\n.' } |
| svntest.actions.run_and_verify_log_xml( |
| expected_revprops=(r0_props,), args=[sbox.repo_url]) |
| |
| |
| ######################################################################## |
| # Run the tests |
| |
| |
| # list all tests here, starting with None: |
| test_list = [ None, |
| plain_log, |
| log_with_empty_repos, |
| log_where_nothing_changed, |
| log_to_revision_zero, |
| dynamic_revision, |
| log_with_path_args, |
| log_wc_with_peg_revision, |
| url_missing_in_head, |
| log_through_copyfrom_history, |
| escape_control_chars, |
| log_xml_empty_date, |
| log_limit, |
| log_base_peg, |
| log_verbose, |
| log_parser, |
| XFail(SkipUnless(merge_sensitive_log_single_revision, |
| server_has_mergeinfo)), |
| SkipUnless(merge_sensitive_log_branching_revision, |
| server_has_mergeinfo), |
| XFail(SkipUnless(merge_sensitive_log_non_branching_revision, |
| server_has_mergeinfo)), |
| SkipUnless(merge_sensitive_log_added_path, |
| server_has_mergeinfo), |
| log_single_change, |
| XFail(log_changes_range), |
| XFail(log_changes_list), |
| only_one_wc_path, |
| retrieve_revprops, |
| log_xml_with_bad_data, |
| ] |
| |
| if __name__ == '__main__': |
| svntest.main.run_tests(test_list) |
| # NOTREACHED |
| |
| |
| ### End of file. |
