subversion/tests/cmdline/history_tests.py

   1 #!/usr/bin/env python
   2 #
   3 #  history_tests.py:  testing history-tracing code
   4 #
   5 #  Subversion is a tool for revision control.
   6 #  See http://subversion.tigris.org for more information.
   7 #
   8 # ====================================================================
   9 # Copyright (c) 2000-2007 CollabNet.  All rights reserved.
  10 #
  11 # This software is licensed as described in the file COPYING, which
  12 # you should have received as part of this distribution.  The terms
  13 # are also available at http://subversion.tigris.org/license-1.html.
  14 # If newer versions of this license are posted there, you may use a
  15 # newer version instead, at your option.
  16 #
  17 ######################################################################
  18
  19 # General modules
  20 import os
  21
  22 # Our testing module
  23 import svntest
  24 from svntest import wc
  25
  26 # (abbreviation)
  27 Skip = svntest.testcase.Skip
  28 XFail = svntest.testcase.XFail
  29 Item = wc.StateItem
  30
  31 ######################################################################
  32 # Tests
  33 #
  34 #   Each test must return on success or raise on failure.
  35
  36 #----------------------------------------------------------------------
  37
  38 def cat_traces_renames(sbox):
  39   "verify that 'svn cat' traces renames"
  40
  41   sbox.build()
  42   wc_dir = sbox.wc_dir
  43   rho_path   = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
  44   pi_path    = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
  45   bloo_path  = os.path.join(wc_dir, 'A', 'D', 'G', 'bloo')
  46
  47   # rename rho to bloo. commit r2.
  48   svntest.main.run_svn(None, 'mv', rho_path, bloo_path)
  49
  50   expected_output = svntest.wc.State(wc_dir, {
  51     'A/D/G/rho' : Item(verb='Deleting'),
  52     'A/D/G/bloo' : Item(verb='Adding')
  53     })
  54   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
  55   expected_status.remove('A/D/G/rho');
  56   expected_status.add({ 'A/D/G/bloo' :
  57                         Item(wc_rev=2, status='  ') })
  58
  59   svntest.actions.run_and_verify_commit(wc_dir,
  60                                         expected_output,
  61                                         expected_status,
  62                                         None,
  63                                         wc_dir)
  64
  65   # rename pi to rho.  commit r3.
  66   svntest.main.run_svn(None, 'mv', pi_path, rho_path)
  67
  68   # svn cat -r1 rho  --> should show pi's contents.
  69   svntest.actions.run_and_verify_svn(None,
  70                                      [ "This is the file 'pi'.\n"], [],
  71                                      'cat',  '-r', '1', rho_path)
  72
  73   expected_output = svntest.wc.State(wc_dir, {
  74     'A/D/G/pi' : Item(verb='Deleting'),
  75     'A/D/G/rho' : Item(verb='Adding')
  76     })
  77   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
  78   expected_status.remove('A/D/G/pi');
  79   expected_status.tweak('A/D/G/rho', wc_rev=3)
  80   expected_status.add({ 'A/D/G/bloo' :
  81                         Item(wc_rev=2, status='  ') })
  82
  83   svntest.actions.run_and_verify_commit(wc_dir,
  84                                         expected_output,
  85                                         expected_status,
  86                                         None,
  87                                         wc_dir)
  88
  89   # update whole wc to HEAD
  90   expected_output = svntest.wc.State(wc_dir, { }) # no output
  91   expected_status.tweak(wc_rev=3)
  92   expected_disk = svntest.main.greek_state.copy()
  93   expected_disk.remove('A/D/G/pi', 'A/D/G/rho')
  94   expected_disk.add({
  95     'A/D/G/rho' : Item("This is the file 'pi'.\n"),
  96     })
  97   expected_disk.add({
  98     'A/D/G/bloo' : Item("This is the file 'rho'.\n"),
  99     })
 100   svntest.actions.run_and_verify_update(wc_dir,
 101                                         expected_output,
 102                                         expected_disk,
 103                                         expected_status)
 104
 105   # 'svn cat bloo' --> should show rho's contents.
 106   svntest.actions.run_and_verify_svn(None,
 107                                      [ "This is the file 'rho'.\n"], [],
 108                                      'cat',  bloo_path)
 109
 110   # svn cat -r1 bloo --> should still show rho's contents.
 111   svntest.actions.run_and_verify_svn(None,
 112                                      [ "This is the file 'rho'.\n"], [],
 113                                      'cat',  '-r', '1', bloo_path)
 114
 115   # svn cat -r1 rho  --> should show pi's contents.
 116   svntest.actions.run_and_verify_svn(None,
 117                                      [ "This is the file 'pi'.\n"], [],
 118                                      'cat',  '-r', '1', rho_path)
 119
 120   # svn up -r1
 121   svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r', '1', wc_dir)
 122   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
 123   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 124
 125   # svn cat -rHEAD rho --> should see 'unrelated object' error.
 126   svntest.actions.run_and_verify_svn("unrelated object",
 127                                      None, svntest.verify.AnyOutput,
 128                                      'cat',  '-r', 'HEAD', rho_path)
 129
 130 def cat_avoids_false_identities(sbox):
 131   "verify that 'svn cat' avoids false identities"
 132
 133   sbox.build()
 134   wc_dir = sbox.wc_dir
 135
 136   # Issue #1970
 137   #
 138   # Highlight a bug in the client side use of the repository's
 139   # location searching algorithm.
 140   #
 141   # The buggy history-following algorithm determines the paths that a
 142   # line of history would be *expected to be* found in a given revision,
 143   # but doesn't treat copies as gaps in the historical sequence.  If
 144   # some other object fills those gaps at the same expected path, the
 145   # client will find the wrong object.
 146   #
 147   # In the recipe below, iota gets created in r1.  In r2, it is
 148   # deleted and replaced with an unrelated object at the same path.
 149   # In r3, the interloper is deleted.  In r4, the original iota is
 150   # resurrected via a copy from r1.
 151   #
 152   #     ,- - - - - - --.
 153   #    o---| o---| o    o----->
 154   #
 155   #    |     |     |    |
 156   #   r1    r2    r3   r4
 157   #
 158   # In a working copy at r4, running
 159   #
 160   #    $ svn cat -r2 iota
 161   #
 162   # should result in an error, but with the bug it instead cats the r2
 163   # interloper.
 164   #
 165   # To reassure yourself that that's wrong, recall that the above
 166   # command is equivalent to
 167   #
 168   #    $ svn cat -r2 iota@4
 169   #
 170   # Now do you see the evil that lies within us?
 171
 172   iota_path = os.path.join(wc_dir, 'iota')
 173   iota_url = sbox.repo_url + '/iota'
 174
 175   # r2
 176   svntest.main.run_svn(None, 'del', iota_path)
 177   svntest.main.file_append(iota_path, "YOU SHOULD NOT SEE THIS\n")
 178   svntest.main.run_svn(None, 'add', iota_path)
 179   svntest.main.run_svn(None, 'ci', '-m', 'log msg',
 180                        wc_dir)
 181   svntest.main.run_svn(None, 'up', wc_dir)
 182
 183   # r3
 184   svntest.main.run_svn(None, 'del', iota_path)
 185   svntest.main.run_svn(None, 'ci', '-m', 'log msg',
 186                        wc_dir)
 187   svntest.main.run_svn(None, 'up', wc_dir)
 188
 189   # r4
 190   svntest.main.run_svn(None, 'cp', iota_url + '@1', wc_dir)
 191   svntest.main.run_svn(None, 'ci', '-m', 'log msg',
 192                        wc_dir)
 193   svntest.main.run_svn(None, 'up', wc_dir)
 194
 195   # 'svn cat -r2 iota' should error, because the line of history
 196   # currently identified by /iota did not exist in r2, even though a
 197   # totally unrelated file of the same name did.
 198   svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
 199                                      'cat', '-r', '2', iota_path)
 200
 201
 202 ########################################################################
 203 # Run the tests
 204
 205 # list all tests here, starting with None:
 206 test_list = [ None,
 207               cat_traces_renames,
 208               cat_avoids_false_identities,
 209               ]
 210
 211 if __name__ == '__main__':
 212   svntest.main.run_tests(test_list)
 213   # NOTREACHED
 214
 215
 216 ### End of file.