Google Git
Sign in
apache / subversion / 1ec204733379f634e2704e1a08fe9833b78e0249 / . / subversion / tests / cmdline / externals_tests.py
blob: ee85024d00b73ba3e4c142048f65b6dc6bcc8679 [file] [log] [blame]
#!/usr/bin/env python
#
# module_tests.py: testing modules / external sources.
#
# Subversion is a tool for revision control.
# See http://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
######################################################################
# General modules
import sys
import os
import re
import shutil
# Our testing module
import svntest
# (abbreviation)
Skip = svntest.testcase.Skip_deco
SkipUnless = svntest.testcase.SkipUnless_deco
XFail = svntest.testcase.XFail_deco
Issues = svntest.testcase.Issues_deco
Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
Item = svntest.wc.StateItem
######################################################################
# Tests
#
# Each test must return on success or raise on failure.
#----------------------------------------------------------------------
### todo: it's inefficient to keep calling externals_test_setup() for
### every test. It's slow. But it's very safe -- we're guaranteed to
### have a clean repository, built from the latest Subversion, with
### the svn:externals properties preset in a known way. Right now I
### can't think of any other way to achieve that guarantee, so the
### result is that each individual test is slow.
def externals_test_setup(sbox):
"""Set up a repository in which some directories have the externals property,
and set up another repository, referred to by some of those externals.
Both repositories contain greek trees with five revisions worth of
random changes, then in the sixth revision the first repository --
and only the first -- has some externals properties set. ### Later,
test putting externals on the second repository. ###
The arrangement of the externals in the first repository is:
/A/B/ ==> ^/A/D/gamma gamma
/A/C/ ==> exdir_G <scheme>:///<other_repos>/A/D/G
../../../<other_repos_basename>/A/D/H@1 exdir_H
/A/D/ ==> ^/../<other_repos_basename>/A exdir_A
//<other_repos>/A/D/G/ exdir_A/G/
exdir_A/H -r 1 <scheme>:///<other_repos>/A/D/H
/<some_paths>/A/B x/y/z/blah
A dictionary is returned keyed by the directory created by the
external whose value is the URL of the external.
"""
# The test itself will create a working copy
sbox.build(create_wc = False)
svntest.main.safe_rmtree(sbox.wc_dir)
wc_init_dir = sbox.add_wc_path('init') # just for setting up props
repo_dir = sbox.repo_dir
repo_url = sbox.repo_url
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
other_repo_basename = os.path.basename(other_repo_dir)
# Get a scheme relative URL to the other repository.
scheme_relative_other_repo_url = other_repo_url[other_repo_url.find(':')+1:]
# Get a server root relative URL to the other repository by trimming
# off the first three /'s.
server_relative_other_repo_url = other_repo_url
for i in range(3):
j = server_relative_other_repo_url.find('/') + 1
server_relative_other_repo_url = server_relative_other_repo_url[j:]
server_relative_other_repo_url = '/' + server_relative_other_repo_url
# These files will get changed in revisions 2 through 5.
mu_path = os.path.join(wc_init_dir, "A/mu")
pi_path = os.path.join(wc_init_dir, "A/D/G/pi")
lambda_path = os.path.join(wc_init_dir, "A/B/lambda")
omega_path = os.path.join(wc_init_dir, "A/D/H/omega")
# These are the directories on which `svn:externals' will be set, in
# revision 6 on the first repo.
B_path = os.path.join(wc_init_dir, "A/B")
C_path = os.path.join(wc_init_dir, "A/C")
D_path = os.path.join(wc_init_dir, "A/D")
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_init_dir)
# Make revisions 2 through 5, but don't bother with pre- and
# post-commit status checks.
svntest.main.file_append(mu_path, "Added to mu in revision 2.\n")
svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
svntest.main.file_append(pi_path, "Added to pi in revision 3.\n")
svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
svntest.main.file_append(lambda_path, "Added to lambda in revision 4.\n")
svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
svntest.main.file_append(omega_path, "Added to omega in revision 5.\n")
svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
# Get the whole working copy to revision 5.
expected_output = svntest.wc.State(wc_init_dir, {
})
svntest.actions.run_and_verify_update(wc_init_dir,
expected_output, None, None)
# Now copy the initial repository to create the "other" repository,
# the one to which the first repository's `svn:externals' properties
# will refer. After this, both repositories have five revisions
# of random stuff, with no svn:externals props set yet.
svntest.main.copy_repos(repo_dir, other_repo_dir, 5)
# This is the returned dictionary.
external_url_for = { }
external_url_for["A/B/gamma"] = "^/A/D/gamma"
external_url_for["A/C/exdir_G"] = other_repo_url + "/A/D/G"
external_url_for["A/C/exdir_H"] = "../../../" + \
other_repo_basename + \
"/A/D/H@1"
# Set up the externals properties on A/B/, A/C/ and A/D/.
externals_desc = \
external_url_for["A/B/gamma"] + " gamma\n"
change_external(B_path, externals_desc, commit=False)
externals_desc = \
"exdir_G " + external_url_for["A/C/exdir_G"] + "\n" + \
external_url_for["A/C/exdir_H"] + " exdir_H\n"
change_external(C_path, externals_desc, commit=False)
external_url_for["A/D/exdir_A"] = "^/../" + other_repo_basename + "/A"
external_url_for["A/D/exdir_A/G/"] = scheme_relative_other_repo_url + \
"/A/D/G/"
external_url_for["A/D/exdir_A/H"] = other_repo_url + "/A/D/H"
external_url_for["A/D/x/y/z/blah"] = server_relative_other_repo_url + "/A/B"
externals_desc = \
external_url_for["A/D/exdir_A"] + " exdir_A" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G/" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
external_url_for["A/D/x/y/z/blah"] + " x/y/z/blah" + \
"\n"
change_external(D_path, externals_desc, commit=False)
# Commit the property changes.
expected_output = svntest.wc.State(wc_init_dir, {
'A/B' : Item(verb='Sending'),
'A/C' : Item(verb='Sending'),
'A/D' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(wc_init_dir, 5)
expected_status.tweak('A/B', 'A/C', 'A/D', wc_rev=6, status=' ')
svntest.actions.run_and_verify_commit(wc_init_dir,
expected_output,
expected_status)
return external_url_for
def change_external(path, new_val, commit=True):
"""Change the value of the externals property on PATH to NEW_VAL,
and commit the change unless COMMIT is False."""
svntest.actions.set_prop('svn:externals', new_val, path)
if commit:
svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'log msg', '--quiet', path)
def change_external_expect_error(path, new_val, expected_err):
"""Try to change the value of the externals property on PATH to NEW_VAL,
but expect to get an error message that matches EXPECTED_ERR."""
svntest.actions.set_prop('svn:externals', new_val, path,
expected_re_string=expected_err)
def probe_paths_exist(paths):
""" Probe each one of PATHS to see if it exists, otherwise throw a
Failure exception. """
for path in paths:
if not os.path.exists(path):
raise svntest.Failure("Probing for " + path + " failed.")
def probe_paths_missing(paths):
""" Probe each one of PATHS to see if does not exist, otherwise throw a
Failure exception. """
for path in paths:
if os.path.exists(path):
raise svntest.Failure(path + " unexpectedly still exists.")
#----------------------------------------------------------------------
### todo: It would be great if everything used the new wc.py system to
### check output/status. In fact, it would be great to do more output
### and status checking period! But must first see how well the
### output checkers deal with multiple summary lines. With external
### modules, you can get the first "Updated to revision X" line, and
### then there will be more "Updated to..." and "Checked out..." lines
### following it, one line for each new or changed external.
#----------------------------------------------------------------------
def checkout_with_externals(sbox):
"test checkouts with externals"
externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Probe the working copy a bit, see if it's as expected.
expected_existing_paths = [
sbox.ospath('A/B/gamma'),
sbox.ospath('A/C/exdir_G'),
sbox.ospath('A/C/exdir_G/pi'),
sbox.ospath('A/C/exdir_H'),
sbox.ospath('A/C/exdir_H/omega'),
sbox.ospath('A/D/x'),
sbox.ospath('A/D/x/y'),
sbox.ospath('A/D/x/y/z'),
sbox.ospath('A/D/x/y/z/blah'),
sbox.ospath('A/D/x/y/z/blah/E/alpha'),
sbox.ospath('A/D/x/y/z/blah/E/beta'),
]
probe_paths_exist(expected_existing_paths)
# Pick a file at random, make sure it has the expected contents.
for path, contents in ((sbox.ospath('A/C/exdir_H/omega'),
"This is the file 'omega'.\n"),
(sbox.ospath('A/B/gamma'),
"This is the file 'gamma'.\n")):
if open(path).read() != contents:
raise svntest.Failure("Unexpected contents for rev 1 of " + path)
#----------------------------------------------------------------------
def update_receive_new_external(sbox):
"update to receive a new external module"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
other_wc_dir = sbox.add_wc_path('other')
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
# Checkout two working copies.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, other_wc_dir)
# Add one new external item to the property on A/D. The new item is
# "exdir_E", deliberately added in the middle not at the end.
new_externals_desc = \
external_url_for["A/D/exdir_A"] + " exdir_A" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G/" + \
"\n" + \
"exdir_E " + other_repo_url + "/A/B/E" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
external_url_for["A/D/x/y/z/blah"] + " x/y/z/blah" + \
"\n"
# Set and commit the property
change_external(sbox.ospath('A/D'), new_externals_desc)
# Update the other working copy, see if we get the new item.
expected_output = svntest.wc.State(other_wc_dir, {
'A/D' : Item(status=' U'),
'A/D/exdir_E/beta' : Item(status='A '),
'A/D/exdir_E/alpha' : Item(status='A '),
})
svntest.actions.run_and_verify_update(other_wc_dir,
expected_output, None, None)
probe_paths_exist([os.path.join(other_wc_dir, "A", "D", "exdir_E")])
#----------------------------------------------------------------------
def update_lose_external(sbox):
"update to lose an external module"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
other_wc_dir = sbox.add_wc_path('other')
repo_url = sbox.repo_url
# Checkout two working copies.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, other_wc_dir)
# Lose one new external item from A/D. The lost item is
# "exdir_A", chosen because there are two other externals underneath
# it (G and H) which are not being removed. We expect them to
# remain -- in other words:
#
# BEFORE AFTER
# ------------ ------------
# A/D/exdir_A A/D/exdir_A
# A/D/exdir_A/.svn/... <GONE>
# A/D/exdir_A/mu <GONE>
# A/D/exdir_A/B/... <GONE>
# A/D/exdir_A/C/... <GONE>
# A/D/exdir_A/D/... <GONE>
# A/D/exdir_A/G/... A/D/exdir_A/G/...
# A/D/exdir_A/H/... A/D/exdir_A/H/...
new_externals_desc = \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
external_url_for["A/D/x/y/z/blah"] + " x/y/z/blah" + \
"\n"
# Set and commit the property
change_external(sbox.ospath('A/D'), new_externals_desc)
# The code should handle a missing local externals item
svntest.main.safe_rmtree(os.path.join(other_wc_dir, "A", "D", "exdir_A", \
"D"))
# Update other working copy, see if lose & preserve things appropriately
expected_output = svntest.wc.State(other_wc_dir, {
'A/D' : Item(status=' U'),
'A/D/exdir_A' : Item(verb='Removed external'),
})
svntest.actions.run_and_verify_update(other_wc_dir,
expected_output, None, None)
expected_existing_paths = [
os.path.join(other_wc_dir, "A", "D", "exdir_A"),
os.path.join(other_wc_dir, "A", "D", "exdir_A", "G"),
os.path.join(other_wc_dir, "A", "D", "exdir_A", "H"),
]
probe_paths_exist(expected_existing_paths)
expected_missing_paths = [
os.path.join(other_wc_dir, "A", "D", "exdir_A", "mu"),
os.path.join(other_wc_dir, "A", "D", "exdir_A", "B"),
os.path.join(other_wc_dir, "A", "D", "exdir_A", "C"),
os.path.join(other_wc_dir, "A", "D", "exdir_A", "D"),
]
probe_paths_missing(expected_missing_paths)
#----------------------------------------------------------------------
def update_change_pristine_external(sbox):
"update change to an unmodified external module"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
other_wc_dir = sbox.add_wc_path('other')
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
# Checkout two working copies.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, other_wc_dir)
# Change the "x/y/z/blah" external on A/D to point to a different
# URL. Since no changes were made to the old checked-out external,
# we should get a clean replace.
new_externals_desc = \
external_url_for["A/D/exdir_A"] + " exdir_A" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
"x/y/z/blah " + other_repo_url + "/A/B/F" + \
"\n"
# Set and commit the property
change_external(sbox.ospath('A/D'), new_externals_desc)
# Update other working copy, see if get the right change.
expected_output = svntest.wc.State(other_wc_dir, {
'A/D' : Item(status=' U'),
'A/D/x/y/z/blah/F' : Item(status='D '),
'A/D/x/y/z/blah/E' : Item(status='D '),
'A/D/x/y/z/blah/lambda': Item(status='D '),
})
svntest.actions.run_and_verify_update(other_wc_dir,
expected_output, None, None)
xyzb_path = os.path.join(other_wc_dir, "x", "y", "z", "blah")
expected_missing_paths = [
os.path.join(xyzb_path, "alpha"),
os.path.join(xyzb_path, "beta"),
]
probe_paths_missing(expected_missing_paths)
def update_change_modified_external(sbox):
"update changes to a modified external module"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
other_wc_dir = sbox.add_wc_path('other')
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
# Checkout two working copies.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, other_wc_dir)
# Make a couple of mods in the "x/y/z/blah/" external.
alpha_path = os.path.join(other_wc_dir, "A", "D",
"x", "y", "z", "blah", "alpha")
svntest.main.file_append(alpha_path, "Some new text in alpha.\n")
new_file = os.path.join(other_wc_dir, "A", "D",
"x", "y", "z", "blah", "fish.txt")
svntest.main.file_append(new_file, "This is an unversioned file.\n")
# Change the "x/y/z/blah" external on A/D to point to a different
# URL. There are some local mods under the old checked-out external,
# so the old dir should be saved under a new name.
new_externals_desc = \
external_url_for["A/D/exdir_A"] + " exdir_A" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G/" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
"x/y/z/blah " + other_repo_url + "/A/B/F" + \
"\n"
# Set and commit the property
change_external(sbox.ospath('A/D'), new_externals_desc)
# Update other working copy, see if get the right change.
expected_output = svntest.wc.State(other_wc_dir, {
'A/D' : Item(status=' U'),
'A/D/x/y/z/blah/F' : Item(status='D '),
'A/D/x/y/z/blah/lambda': Item(status='D '),
'A/D/x/y/z/blah/E' : Item(status='D '),
})
svntest.actions.run_and_verify_update(other_wc_dir,
expected_output, None, None)
xyzb_path = os.path.join(other_wc_dir, "x", "y", "z", "blah")
expected_missing_paths = [
os.path.join(xyzb_path, "alpha"),
os.path.join(xyzb_path, "beta"),
]
probe_paths_missing(expected_missing_paths)
def update_receive_change_under_external(sbox):
"update changes under an external module"
externals_test_setup(sbox)
wc_dir = sbox.wc_dir
other_wc_dir = sbox.add_wc_path('other')
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
# Checkout two working copies.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'checkout',
other_repo_url, other_wc_dir)
# Commit some modifications from the other_wc.
other_gamma_path = os.path.join(other_wc_dir, 'A', 'D', 'gamma')
svntest.main.file_append(other_gamma_path, "New text in other gamma.\n")
expected_output = svntest.wc.State(other_wc_dir, {
'A/D/gamma' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(other_wc_dir, 5)
expected_status.tweak('A/D/gamma', wc_rev=6)
svntest.actions.run_and_verify_commit(other_wc_dir,
expected_output,
expected_status)
# Now update the regular wc to see if we get the change. Note that
# none of the module *properties* in this wc have been changed; only
# the source repository of the modules has received a change, and
# we're verifying that an update here pulls that change.
# The output's going to be all screwy because of the module
# notifications, so don't bother parsing it, just run update
# directly.
expected_output = svntest.wc.State(wc_dir, {
'A/D/exdir_A/D/gamma': Item(status='U '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
external_gamma_path = sbox.ospath('A/D/exdir_A/D/gamma')
contents = open(external_gamma_path).read()
if contents != ("This is the file 'gamma'.\n"
"New text in other gamma.\n"):
raise svntest.Failure("Unexpected contents for externally modified " +
external_gamma_path)
# Commit more modifications
other_rho_path = os.path.join(other_wc_dir, 'A', 'D', 'G', 'rho')
svntest.main.file_append(other_rho_path, "New text in other rho.\n")
expected_output = svntest.wc.State(other_wc_dir, {
'A/D/G/rho' : Item(verb='Sending'),
})
expected_status = svntest.actions.get_virginal_state(other_wc_dir, 5)
expected_status.tweak('A/D/gamma', wc_rev=6)
expected_status.tweak('A/D/G/rho', wc_rev=7)
svntest.actions.run_and_verify_commit(other_wc_dir,
expected_output,
expected_status)
expected_output = svntest.wc.State(sbox.ospath('A/C'), {
'exdir_G/rho' : Item(status='U '),
})
svntest.actions.run_and_verify_update(sbox.ospath('A/C'),
expected_output, None, None)
external_rho_path = sbox.ospath('A/C/exdir_G/rho')
contents = open(external_rho_path).read()
if contents != ("This is the file 'rho'.\n"
"New text in other rho.\n"):
raise svntest.Failure("Unexpected contents for externally modified " +
external_rho_path)
#----------------------------------------------------------------------
def modify_and_update_receive_new_external(sbox):
"commit and update additional externals"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout a working copy
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Add one more external item
B_path = sbox.ospath('A/B')
externals_desc = \
external_url_for["A/D/exdir_A/G/"] + " exdir_G" + \
"\n" + \
"exdir_H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
"exdir_Z " + external_url_for["A/D/exdir_A/H"] + \
"\n"
change_external(B_path, externals_desc)
# Now cd into A/B and try updating
was_cwd = os.getcwd()
os.chdir(B_path)
# Once upon a time there was a core-dump here
svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], 'up' )
os.chdir(was_cwd)
probe_paths_exist([os.path.join(B_path, "exdir_Z")])
#----------------------------------------------------------------------
def disallow_dot_or_dotdot_directory_reference(sbox):
"error if external target dir involves '.' or '..'"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout a working copy
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Try to set illegal externals in the original WC.
def set_externals_for_path_expect_error(path, val):
expected_err = ".*Invalid svn:externals property on '.*': target " + \
"'.*' is an absolute path or involves '..'.*"
change_external_expect_error(path, val, expected_err)
B_path = sbox.ospath('A/B')
G_path = sbox.ospath('A/D/G')
H_path = sbox.ospath('A/D/H')
C_path = sbox.ospath('A/C')
F_path = sbox.ospath('A/B/F')
external_urls = list(external_url_for.values())
# The external_urls contains some examples of relative urls that are
# ambiguous with these local test paths, so we have to use the
# <url> <path> ordering here to check the local path validator.
externals_value_1 = external_urls.pop() + " ../foo\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_2 = external_urls.pop() + " foo/bar/../baz\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_3 = external_urls.pop() + " foo/..\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_4 = external_urls.pop() + " .\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_5 = external_urls.pop() + " ./\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_6 = external_urls.pop() + " ..\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_7 = external_urls.pop() + " ././/.///. \n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_8 = external_urls.pop() + " /foo \n"
if not external_urls: external_urls = list(external_url_for.values())
if svntest.main.is_os_windows():
externals_value_9 = external_urls.pop() + " D:/foo\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_10 = external_urls.pop() + " D:\\foo\n"
if not external_urls: external_urls = list(external_url_for.values())
externals_value_11 = external_urls.pop() + " D:foo\n"
if not external_urls: external_urls = list(external_url_for.values())
set_externals_for_path_expect_error(B_path, externals_value_1)
set_externals_for_path_expect_error(G_path, externals_value_2)
set_externals_for_path_expect_error(H_path, externals_value_3)
set_externals_for_path_expect_error(C_path, externals_value_4)
set_externals_for_path_expect_error(F_path, externals_value_5)
set_externals_for_path_expect_error(B_path, externals_value_6)
set_externals_for_path_expect_error(G_path, externals_value_7)
set_externals_for_path_expect_error(H_path, externals_value_8)
if svntest.main.is_os_windows():
set_externals_for_path_expect_error(B_path, externals_value_9)
set_externals_for_path_expect_error(B_path, externals_value_10)
set_externals_for_path_expect_error(B_path, externals_value_11)
#----------------------------------------------------------------------
def export_with_externals(sbox):
"test exports with externals"
externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'export',
repo_url, wc_dir)
# Probe the working copy a bit, see if it's as expected.
expected_existing_paths = [
sbox.ospath('A/C/exdir_G'),
sbox.ospath('A/C/exdir_G/pi'),
sbox.ospath('A/C/exdir_H'),
sbox.ospath('A/C/exdir_H/omega'),
sbox.ospath('A/D/x'),
sbox.ospath('A/D/x/y'),
sbox.ospath('A/D/x/y/z'),
sbox.ospath('A/D/x/y/z/blah'),
sbox.ospath('A/D/x/y/z/blah/E/alpha'),
sbox.ospath('A/D/x/y/z/blah/E/beta'),
]
probe_paths_exist(expected_existing_paths)
# Pick some files, make sure their contents are as expected.
exdir_G_pi_path = sbox.ospath('A/C/exdir_G/pi')
contents = open(exdir_G_pi_path).read()
if contents != ("This is the file 'pi'.\n"
"Added to pi in revision 3.\n"):
raise svntest.Failure("Unexpected contents for rev 1 of " +
exdir_G_pi_path)
exdir_H_omega_path = sbox.ospath('A/C/exdir_H/omega')
contents = open(exdir_H_omega_path).read()
if contents != "This is the file 'omega'.\n":
raise svntest.Failure("Unexpected contents for rev 1 of " +
exdir_H_omega_path)
#----------------------------------------------------------------------
# Test for issue #2429
@Issue(2429)
def export_wc_with_externals(sbox):
"test exports from working copies with externals"
paths_dict = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
export_target = sbox.add_wc_path('export')
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Export the working copy.
svntest.actions.run_and_verify_svn(None, [],
'export', wc_dir, export_target)
### We should be able to check exactly the paths that externals_test_setup()
### set up; however, --ignore-externals fails to ignore 'A/B/gamma' so this
### doesn't work:
# paths = [ os.path.join(export_target, path) for path in paths_dict.keys() ]
### Therefore currently we check only a particular selection of paths.
paths = [
os.path.join(export_target, "A", "C", "exdir_G"),
os.path.join(export_target, "A", "C", "exdir_G", "pi"),
os.path.join(export_target, "A", "C", "exdir_H"),
os.path.join(export_target, "A", "C", "exdir_H", "omega"),
os.path.join(export_target, "A", "D", "x"),
os.path.join(export_target, "A", "D", "x", "y"),
os.path.join(export_target, "A", "D", "x", "y", "z"),
os.path.join(export_target, "A", "D", "x", "y", "z", "blah"),
os.path.join(export_target, "A", "D", "x", "y", "z", "blah", "E", "alpha"),
os.path.join(export_target, "A", "D", "x", "y", "z", "blah", "E", "beta"),
]
probe_paths_exist(paths)
svntest.main.safe_rmtree(export_target)
# Export it again, without externals.
svntest.actions.run_and_verify_svn(None, [],
'export', '--ignore-externals',
wc_dir, export_target)
probe_paths_missing(paths)
#----------------------------------------------------------------------
def external_with_peg_and_op_revision(sbox):
"use a peg revision to specify an external module"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# remove A/D/H in the other repo
svntest.actions.run_and_verify_svn(None, [],
'rm',
external_url_for["A/D/exdir_A/H"],
'-m', 'remove original A/D/H')
# Set an external property using peg revision syntax.
new_externals_desc = \
external_url_for["A/D/exdir_A/H"] + "@4 exdir_A/H" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G" + \
"\n"
# Set and commit the property.
change_external(sbox.ospath('A/D'), new_externals_desc)
# Update other working copy, see if we get the right change.
expected_output = svntest.wc.State(wc_dir, {
'A/D/x/y/z/blah' : Item(verb='Removed external'),
'A/D/exdir_A' : Item(verb='Removed external'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
external_chi_path = sbox.ospath('A/D/exdir_A/H/chi')
contents = open(external_chi_path).read()
if contents != "This is the file 'chi'.\n":
raise svntest.Failure("Unexpected contents for externally modified " +
external_chi_path)
#----------------------------------------------------------------------
def new_style_externals(sbox):
"check the new '-rN URL PATH' syntax"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Set an external property using the new '-rN URL PATH' syntax.
new_externals_desc = \
external_url_for["A/C/exdir_G"] + " exdir_G" + \
"\n" + \
"-r 1 " + external_url_for["A/C/exdir_H"] + " exdir_H" + \
"\n" + \
"-r1 " + external_url_for["A/C/exdir_H"] + " exdir_I" + \
"\n"
# Set and commit the property.
change_external(sbox.ospath('A/C'), new_externals_desc)
# Update other working copy.
expected_output = svntest.wc.State(wc_dir, {
'A/C/exdir_I/chi' : Item(status='A '),
'A/C/exdir_I/omega' : Item(status='A '),
'A/C/exdir_I/psi' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
for dir_name in ["exdir_H", "exdir_I"]:
exdir_X_omega_path = os.path.join(wc_dir, "A", "C", dir_name, "omega")
contents = open(exdir_X_omega_path).read()
if contents != "This is the file 'omega'.\n":
raise svntest.Failure("Unexpected contents for rev 1 of " +
exdir_X_omega_path)
#----------------------------------------------------------------------
def disallow_propset_invalid_formatted_externals(sbox):
"error if propset'ing external with invalid format"
# Bootstrap
sbox.build()
wc_dir = sbox.wc_dir
A_path = sbox.ospath('A')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# It should not be possible to set these external properties on a
# directory.
for ext in [ b'arg1',
b'arg1 arg2 arg3',
b'arg1 arg2 arg3 arg4',
b'arg1 arg2 arg3 arg4 arg5',
b'-r',
b'-r1',
b'-r 1',
b'-r1 arg1',
b'-r 1 arg1',
b'arg1 -r',
b'arg1 -r1',
b'arg1 -r 1',
]:
change_external_expect_error(A_path, ext,
'.*Error parsing svn:externals.*')
for ext in [ b'-r abc arg1 arg2',
b'-rabc arg1 arg2',
b'arg1 -r abc arg2',
b'arg1 -rabc arg2',
]:
change_external_expect_error(A_path, ext,
'.*Error parsing svn:externals.*')
for ext in [ b'http://example.com/ http://example.com/',
b'-r1 http://example.com/ http://example.com/',
b'-r 1 http://example.com/ http://example.com/',
b'http://example.com/ -r1 http://example.com/',
b'http://example.com/ -r 1 http://example.com/',
]:
change_external_expect_error(A_path, ext,
'.*cannot use two absolute URLs.*')
for ext in [ b'http://example.com/ -r1 foo',
b'http://example.com/ -r 1 foo',
b'-r1 foo http://example.com/',
b'-r 1 foo http://example.com/'
]:
change_external_expect_error(A_path, ext,
'.*cannot use a URL \'.*\' as the ' \
'target directory for an external ' \
'definition.*')
#----------------------------------------------------------------------
def old_style_externals_ignore_peg_reg(sbox):
"old 'PATH URL' format should ignore peg revisions"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Update the working copy.
expected_output = svntest.wc.State(wc_dir, {
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
# Set an external property using the old 'PATH URL' syntax with
# @HEAD in the URL.
ext = "exdir_G " + external_url_for["A/C/exdir_G"] + "@HEAD\n"
# Set and commit the property.
change_external(sbox.ospath('A'), ext)
# Update the working copy. This should succeed (exitcode 0) but
# should print warnings on the external because the URL with '@HEAD'
# does not exist.
expected_error = "|".join([".*Error handling externals definition.*",
".*URL .*/A/D/G@HEAD' .* doesn't exist.*",
])
svntest.actions.run_and_verify_svn2(None,
expected_error,
1,
'up',
wc_dir)
#----------------------------------------------------------------------
def cannot_move_or_remove_file_externals(sbox):
"should not be able to mv or rm a file external"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Should not be able to delete the file external.
svntest.actions.run_and_verify_svn(None,
".*Cannot remove the external at "
".*gamma.*; please .* "
"the svn:externals .*",
'rm',
sbox.ospath('A/B/gamma'))
# Should not be able to move the file external.
svntest.actions.run_and_verify_svn(None,
".*Cannot move the external at "
".*gamma.*; please .*edit.*"
"svn:externals.*",
'mv',
sbox.ospath('A/B/gamma'),
sbox.ospath('A/B/gamma1'))
# But the directory that contains it can be deleted.
expected_status = svntest.actions.get_virginal_state(wc_dir, 6)
svntest.actions.run_and_verify_svn(None, [],
'rm',
sbox.ospath('A/B'))
expected_status.tweak('A/B', status='D ')
expected_output = svntest.wc.State(wc_dir, {
'A/B' : Item(verb='Deleting'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 6)
expected_status.remove('A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
'A/B/F', 'A/B/lambda')
expected_status.add({
'A/D/exdir_A' : Item(status=' ', wc_rev='5', prev_status='X '),
'A/D/exdir_A/D' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/gamma' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G/pi' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G/rho' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G/tau' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H/chi' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H/psi' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H/omega' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/E' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/E/beta' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/E/alpha' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/F' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/lambda' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G/pi' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G/tau' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G/rho' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/H' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/H/psi' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/H/omega' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/H/chi' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/C' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/mu' : Item(status=' ', wc_rev='5'),
'A/C/exdir_G' : Item(status=' ', prev_status='X ', wc_rev='5'),
'A/C/exdir_G/tau' : Item(status=' ', wc_rev='5'),
'A/C/exdir_G/pi' : Item(status=' ', wc_rev='5'),
'A/C/exdir_G/rho' : Item(status=' ', wc_rev='5'),
'A/D/x' : Item(status='X '),
'A/D/x/y/z/blah' : Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/lambda' : Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/E' : Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/E/beta' : Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/E/alpha': Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/F' : Item(status=' ', wc_rev='5'),
'A/C/exdir_H' : Item(status=' ', prev_status='X ', wc_rev='1'),
'A/C/exdir_H/omega' : Item(status=' ', wc_rev='1'),
'A/C/exdir_H/chi' : Item(status=' ', wc_rev='1'),
'A/C/exdir_H/psi' : Item(status=' ', wc_rev='1'),
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status)
# Bring the working copy up to date and check that the file the file
# external is switched to still exists.
expected_output = svntest.wc.State(wc_dir, {
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
open(sbox.ospath('A/D/gamma')).close()
#----------------------------------------------------------------------
def cant_place_file_external_into_dir_external(sbox):
"place a file external into a directory external"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
# Checkout a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Put a directory external into the same repository and then a file
# external into that.
ext = "^/A/D A/D-copy\n" + \
"^/A/B/E/beta A/D-copy/G/beta\n"
change_external(wc_dir, ext)
# Bring the working copy up to date and check that the file the file
# external is switched to still exists.
svntest.actions.run_and_verify_svn(None, 'svn: E205011: ' +
'Failure occurred.*definitions',
'up', wc_dir)
#----------------------------------------------------------------------
# Issue #2461.
@Issue(2461)
def external_into_path_with_spaces(sbox):
"allow spaces in external local paths"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
ext = '^/A/D "A/copy of D"\n' +\
'^/A/D A/another\ copy\ of\ D'
change_external(wc_dir, ext)
expected_output = svntest.wc.State(wc_dir, {
'A/another copy of D/G': Item(status='A '),
'A/another copy of D/G/pi': Item(status='A '),
'A/another copy of D/G/tau': Item(status='A '),
'A/another copy of D/G/rho': Item(status='A '),
'A/another copy of D/H': Item(status='A '),
'A/another copy of D/H/chi': Item(status='A '),
'A/another copy of D/H/omega': Item(status='A '),
'A/another copy of D/H/psi': Item(status='A '),
'A/another copy of D/gamma': Item(status='A '),
'A/copy of D/H' : Item(status='A '),
'A/copy of D/H/chi' : Item(status='A '),
'A/copy of D/H/omega': Item(status='A '),
'A/copy of D/H/psi' : Item(status='A '),
'A/copy of D/gamma' : Item(status='A '),
'A/copy of D/G' : Item(status='A '),
'A/copy of D/G/rho' : Item(status='A '),
'A/copy of D/G/tau' : Item(status='A '),
'A/copy of D/G/pi' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
probe_paths_exist([
sbox.ospath('A/copy of D'),
sbox.ospath('A/another copy of D'),
])
#----------------------------------------------------------------------
# Issue #3368
@Issue(3368)
def binary_file_externals(sbox):
"binary file externals"
sbox.build()
wc_dir = sbox.wc_dir
# Add a binary file A/theta, write PNG file data into it.
theta_contents = open(os.path.join(sys.path[0], "theta.bin"), 'rb').read()
theta_path = sbox.ospath('A/theta')
svntest.main.file_write(theta_path, theta_contents, 'wb')
svntest.main.run_svn(None, 'add', theta_path)
# Commit the binary file
expected_output = svntest.wc.State(wc_dir, {
'A/theta' : Item(verb='Adding (bin)'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status)
# Create a file external on the binary file A/theta
C = sbox.ospath('A/C')
external = os.path.join(C, 'external')
externals_prop = "^/A/theta external\n"
# Set and commit the property.
change_external(C, externals_prop)
# Now, /A/C/external is designated as a file external pointing to
# the binary file /A/theta, but the external file is not there yet.
# Try to actually insert the external file via a verified update:
expected_output = svntest.wc.State(wc_dir, {
'A/C/external' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/theta' : Item(
theta_contents,
props={'svn:mime-type' : 'application/octet-stream'}),
'A/C' : Item(props={'svn:externals':externals_prop}),
'A/C/external' : Item(
theta_contents,
props={'svn:mime-type' : 'application/octet-stream'}),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=3),
'A/C/external' : Item(status=' ', wc_rev=3, switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
#----------------------------------------------------------------------
# Issue #3351.
@Issue(3351)
def update_lose_file_external(sbox):
"delete a file external"
sbox.build()
wc_dir = sbox.wc_dir
# Create a file external in A/C/external on the file A/mu
C = sbox.ospath('A/C')
external = os.path.join(C, 'external')
externals_prop = "^/A/mu external\n"
# Set and commit the property.
change_external(C, externals_prop)
# Now, /A/C/external is designated as a file external pointing to
# the file /A/mu, but the external file is not there yet.
# Try to actually insert the external file via an update:
expected_output = svntest.wc.State(wc_dir, {
'A/C/external' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/C' : Item(props={'svn:externals':externals_prop}),
'A/C/external' : Item("This is the file 'mu'.\n"),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/C/external' : Item(status=' ', wc_rev='2', switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
# now remove the svn:external prop
svntest.actions.run_and_verify_svn(None, [],
'propdel', 'svn:externals', C)
# commit the property change
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Sending'),
})
# (re-use above expected_status)
expected_status.tweak('A/C', wc_rev = 3)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status)
# try to actually get rid of the external via an update
expected_output = svntest.wc.State(wc_dir, {
'A/C/external' : Item(verb='Removed external')
})
# (re-use above expected_disk)
expected_disk.tweak('A/C', props = {})
expected_disk.remove('A/C/external')
# (re-use above expected_status)
expected_status.tweak(wc_rev = 3)
# And assume that the external will be removed.
expected_status.remove('A/C/external')
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
probe_paths_missing([sbox.ospath('A/C/external')])
#----------------------------------------------------------------------
# Issue #3351.
@Issue(3351)
def switch_relative_external(sbox):
"switch a relative external"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create a relative external in A/D on ../B
A_path = sbox.ospath('A')
A_copy_path = sbox.ospath('A_copy')
A_copy_url = repo_url + '/A_copy'
D_path = os.path.join(A_path, 'D')
ext_path = os.path.join(D_path, 'ext')
externals_prop = "../B ext\n"
change_external(D_path, externals_prop)
# Update our working copy, and create a "branch" (A => A_copy)
expected_output = svntest.wc.State(wc_dir, {
'A/D/ext/E' : Item(status='A '),
'A/D/ext/E/beta' : Item(status='A '),
'A/D/ext/E/alpha' : Item(status='A '),
'A/D/ext/F' : Item(status='A '),
'A/D/ext/lambda' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
svntest.actions.run_and_verify_svn(None, [], 'cp',
'--quiet', A_path, A_copy_path)
svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg',
'--quiet', wc_dir)
# Okay. We now want to switch A to A_copy, which *should* cause
# A/D/ext to point to the URL for A_copy/B (instead of A/B).
svntest.actions.run_and_verify_svn(None, [], 'sw',
A_copy_url, A_path)
expected_infos = [
{ 'Path' : re.escape(D_path),
'URL' : sbox.repo_url + '/A_copy/D',
},
{ 'Path' : re.escape(ext_path),
'URL' : sbox.repo_url + '/A_copy/B',
},
]
svntest.actions.run_and_verify_info(expected_infos, D_path, ext_path)
#----------------------------------------------------------------------
# A regression test for a bug in exporting externals from a mixed-depth WC.
def export_sparse_wc_with_externals(sbox):
"export from a sparse working copy with externals"
externals_test_setup(sbox)
repo_url = sbox.repo_url + '/A/B'
wc_dir = sbox.wc_dir
# /A/B contains (dir 'E', dir 'F', file 'lambda', external dir 'gamma').
children = [ 'E', 'F', 'lambda' ]
ext_children = [ 'gamma' ]
def wc_paths_of(relative_paths):
return [ os.path.join(wc_dir, path) for path in relative_paths ]
child_paths = wc_paths_of(children)
ext_child_paths = wc_paths_of(ext_children)
export_target = sbox.add_wc_path('export')
# Create a working copy with depth=empty itself but children that are
# depth=infinity.
svntest.actions.run_and_verify_svn(None, [],
'checkout', '--depth=empty',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'update', *child_paths)
# Export the working copy.
svntest.actions.run_and_verify_svn(None, [],
'export', wc_dir, export_target)
# It failed with "'gamma' is not under version control" because the
# depth-infinity children led it wrongly to try to process externals
# in the parent.
svntest.main.safe_rmtree(export_target)
#----------------------------------------------------------------------
# Change external from one repo to another
def relegate_external(sbox):
"relegate external from one repo to another"
sbox.build()
wc_dir = sbox.wc_dir
repo_dir = sbox.repo_dir
repo_url = sbox.repo_url
A_path = sbox.ospath('A')
# setup an external within the same repository
externals_desc = '^/A/B/E external'
change_external(A_path, externals_desc)
expected_output = svntest.wc.State(wc_dir, {
'A/external/alpha' : Item(status='A '),
'A/external/beta' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
# create another repository
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
svntest.main.copy_repos(repo_dir, other_repo_dir, 2)
# point external to the other repository
externals_desc = other_repo_url + '/A/B/E external\n'
change_external(A_path, externals_desc)
# Update "relegates", i.e. throws-away and recreates, the external
expected_output = svntest.wc.State(wc_dir, {
'A/external' : Item(), # No A?
'A/external/alpha' : Item(status='A '),
'A/external/beta' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.tweak('A', props={'svn:externals' : externals_desc})
expected_disk.add({
'A/external' : Item(),
'A/external/alpha' : Item('This is the file \'alpha\'.\n'),
'A/external/beta' : Item('This is the file \'beta\'.\n'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.add({
'A/external' : Item(status=' ', prev_status='X ', wc_rev='2'),
'A/external/alpha' : Item(status=' ', wc_rev='2'),
'A/external/beta' : Item(status=' ', wc_rev='2'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
#----------------------------------------------------------------------
# Issue #3552
@Issue(3552)
def wc_repos_file_externals(sbox):
"tag directory with file externals from wc to url"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Add a file A/theta.
theta_path = sbox.ospath('A/theta')
svntest.main.file_write(theta_path, 'theta', 'w')
svntest.main.run_svn(None, 'add', theta_path)
# Created expected output tree for 'svn ci'
expected_output = svntest.wc.State(wc_dir, {
'A/theta' : Item(verb='Adding'),
})
# Create expected status tree
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=2),
})
# Commit the new file, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status)
# Create a file external on the file A/theta
C = sbox.ospath('A/C')
external = os.path.join(C, 'theta')
externals_prop = "^/A/theta theta\n"
# Set and commit the property.
change_external(C, externals_prop)
# Now, /A/C/theta is designated as a file external pointing to
# the file /A/theta, but the external file is not there yet.
# Try to actually insert the external file via a verified update:
expected_output = svntest.wc.State(wc_dir, {
'A/C/theta' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/theta' : Item('theta'),
'A/C' : Item(props={'svn:externals':externals_prop}),
'A/C/theta' : Item('theta'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=3),
'A/C/theta' : Item(status=' ', wc_rev=3, switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
# Copy A/C to a new tag in the repos
tag_url = repo_url + '/A/I'
svntest.main.run_svn(None, 'cp', C, tag_url, '-m', 'create tag')
# Try to actually insert the external file (A/I/theta) via a verified update:
expected_output = svntest.wc.State(wc_dir, {
'A/I' : Item(status='A '),
'A/I/theta' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/theta' : Item('theta'),
'A/C' : Item(props={'svn:externals':externals_prop}),
'A/C/theta' : Item('theta'),
'A/I' : Item(props={'svn:externals':externals_prop}),
'A/I/theta' : Item('theta'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 4)
expected_status.add({
'A/theta' : Item(status=' ', wc_rev=4),
'A/C/theta' : Item(status=' ', wc_rev=4, switched='X'),
'A/I' : Item(status=' ', wc_rev=4),
'A/I/theta' : Item(status=' ', wc_rev=4, switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
#----------------------------------------------------------------------
@SkipUnless(svntest.main.server_has_mergeinfo)
@Issue(3843)
def merge_target_with_externals(sbox):
"merge target with externals"
# Test for a problem the plagued Subversion in the pre-1.7-single-DB world:
# Externals in a merge target would get meaningless explicit mergeinfo set
# on them. See http://svn.haxx.se/dev/archive-2010-08/0088.shtml
externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Some paths we'll care about
A_path = sbox.ospath('A')
A_branch_path = sbox.ospath('A-branch')
A_gamma_branch_path = sbox.ospath('A-branch/D/gamma')
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Setup A/external as file external to A/mu
# and A/external-pinned as a pinned file external to A/mu
externals_prop = "^/A/mu external\n^/A/mu@6 external-pinned\n"
change_external(sbox.ospath('A'), externals_prop)
# Branch A@1 to A-branch and make a simple text change on the latter in r8.
svntest.actions.run_and_verify_svn(None, [], 'copy', A_path + '@1',
A_branch_path)
svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'make a copy', wc_dir)
svntest.main.file_write(A_gamma_branch_path, "The new gamma!\n")
svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'branch edit', wc_dir)
expected_output = svntest.wc.State(wc_dir, {
'A/external' : Item(status='A '),
'A/external-pinned' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
# Merge r8 from A-branch back to A. There should be explicit mergeinfo
# only at the root of A; the externals should not get any.
svntest.actions.run_and_verify_svn(None, [], 'merge', '-c8',
repo_url + '/A-branch', A_path)
svntest.actions.run_and_verify_svn(
["Properties on '" + A_path + "':\n",
" svn:mergeinfo\n",
" /A-branch:8\n"],
[], 'pg', svntest.main.SVN_PROP_MERGEINFO, '-vR', wc_dir)
def update_modify_file_external(sbox):
"update that modifies a file external"
sbox.build()
wc_dir = sbox.wc_dir
# Setup A/external as file external to A/mu
externals_prop = "^/A/mu external\n"
change_external(sbox.ospath('A'), externals_prop)
expected_output = svntest.wc.State(wc_dir, {
'A/external' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A' : Item(props={'svn:externals':externals_prop}),
'A/external' : Item("This is the file 'mu'.\n"),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/external' : Item(status=' ', wc_rev='2', switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
# Modify A/mu
svntest.main.file_append(sbox.ospath('A/mu'), 'appended mu text')
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
})
expected_status.tweak('A/mu', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status)
# Update to modify the file external, this asserts in update_editor.c
expected_output = svntest.wc.State(wc_dir, {
'A/external' : Item(status='U '),
})
expected_disk.tweak('A/mu', 'A/external',
contents=expected_disk.desc['A/mu'].contents
+ 'appended mu text')
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.add({
'A/external' : Item(status=' ', wc_rev='3', switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status,
check_props=True)
# Test for issue #2267
@Issue(2267)
def update_external_on_locally_added_dir(sbox):
"update an external on a locally added dir"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
# Checkout a working copy
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Add one new external item to the property on A/foo. The new item is
# "exdir_E", deliberately added in the middle not at the end.
new_externals_desc = \
external_url_for["A/D/exdir_A"] + " exdir_A" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G/" + \
"\n" + \
"exdir_E " + other_repo_url + "/A/B/E" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
external_url_for["A/D/x/y/z/blah"] + " x/y/z/blah" + \
"\n"
# Add A/foo and set the property on it
new_dir = sbox.ospath("A/foo")
sbox.simple_mkdir("A/foo")
change_external(new_dir, new_externals_desc, commit=False)
# Update the working copy, see if we get the new item.
expected_output = svntest.wc.State(wc_dir, {
'A/foo/exdir_A/B' : Item(status='A '),
'A/foo/exdir_A/B/E' : Item(status='A '),
'A/foo/exdir_A/B/E/beta': Item(status='A '),
'A/foo/exdir_A/B/E/alpha': Item(status='A '),
'A/foo/exdir_A/B/F' : Item(status='A '),
'A/foo/exdir_A/B/lambda': Item(status='A '),
'A/foo/exdir_A/D' : Item(status='A '),
'A/foo/exdir_A/D/G' : Item(status='A '),
'A/foo/exdir_A/D/G/rho': Item(status='A '),
'A/foo/exdir_A/D/G/pi': Item(status='A '),
'A/foo/exdir_A/D/G/tau': Item(status='A '),
'A/foo/exdir_A/D/gamma': Item(status='A '),
'A/foo/exdir_A/D/H' : Item(status='A '),
'A/foo/exdir_A/D/H/chi': Item(status='A '),
'A/foo/exdir_A/D/H/omega': Item(status='A '),
'A/foo/exdir_A/D/H/psi': Item(status='A '),
'A/foo/exdir_A/C' : Item(status='A '),
'A/foo/exdir_A/mu' : Item(status='A '),
'A/foo/exdir_A/H/omega': Item(status='A '),
'A/foo/exdir_A/H/psi': Item(status='A '),
'A/foo/exdir_A/H/chi': Item(status='A '),
'A/foo/exdir_A/G/tau': Item(status='A '),
'A/foo/exdir_A/G/rho': Item(status='A '),
'A/foo/exdir_A/G/pi': Item(status='A '),
'A/foo/x/y/z/blah/F': Item(status='A '),
'A/foo/x/y/z/blah/E': Item(status='A '),
'A/foo/x/y/z/blah/E/beta': Item(status='A '),
'A/foo/x/y/z/blah/E/alpha': Item(status='A '),
'A/foo/x/y/z/blah/lambda': Item(status='A '),
'A/foo/exdir_E/beta': Item(status='A '),
'A/foo/exdir_E/alpha': Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None)
probe_paths_exist([sbox.ospath('A/foo/exdir_E')])
# Test for issue #2267
@Issue(2267)
def switch_external_on_locally_added_dir(sbox):
"switch an external on a locally added dir"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
other_repo_url = repo_url + ".other"
A_path = repo_url + "/A"
A_copy_path = repo_url + "/A_copy"
# Create a branch of A
# Checkout a working copy
svntest.actions.run_and_verify_svn(None, [],
'copy',
A_path, A_copy_path,
'-m', 'Create branch of A')
# Checkout a working copy
svntest.actions.run_and_verify_svn(None, [],
'checkout',
A_path, wc_dir)
# Add one new external item to the property on A/foo. The new item is
# "exdir_E", deliberately added in the middle not at the end.
new_externals_desc = \
external_url_for["A/D/exdir_A"] + " exdir_A" + \
"\n" + \
external_url_for["A/D/exdir_A/G/"] + " exdir_A/G/" + \
"\n" + \
"exdir_E " + other_repo_url + "/A/B/E" + \
"\n" + \
"exdir_A/H -r 1 " + external_url_for["A/D/exdir_A/H"] + \
"\n" + \
external_url_for["A/D/x/y/z/blah"] + " x/y/z/blah" + \
"\n"
# Add A/foo and set the property on it
new_dir = sbox.ospath("foo")
sbox.simple_mkdir("foo")
change_external(new_dir, new_externals_desc, commit=False)
# Switch the working copy to the branch, see if we get the new item.
svntest.actions.run_and_verify_svn(None, [], 'sw', A_copy_path, wc_dir)
probe_paths_exist([sbox.ospath('foo/exdir_E')])
@Issue(3819)
def file_external_in_sibling(sbox):
"update a file external in sibling dir"
sbox.build()
wc_dir = sbox.wc_dir
# Setup A2/iota as file external to ^/iota
externals_prop = "^/iota iota\n"
sbox.simple_mkdir("A2")
change_external(sbox.ospath('A2'), externals_prop)
sbox.simple_update()
os.chdir(sbox.ospath("A"))
svntest.actions.run_and_verify_svn(svntest.actions.expected_noop_update_output(2),
[], 'update')
@Issue(3823)
def file_external_update_without_commit(sbox):
"update a file external without committing target"
sbox.build(read_only=True)
# Setup A2/iota as file external to ^/iota
externals_prop = "^/iota iota\n"
sbox.simple_mkdir("A2")
change_external(sbox.ospath('A2'), externals_prop, commit=False)
# A2/ is an uncommitted added dir with an svn:externals property set.
sbox.simple_update()
def incoming_file_on_file_external(sbox):
"bring in a new file over a file external"
sbox.build()
repo_url = sbox.repo_url
wc_dir = sbox.wc_dir
change_external(sbox.wc_dir, "^/A/B/lambda ext\n")
# And bring in the file external
sbox.simple_update()
svntest.main.run_svn(None, 'cp', repo_url + '/iota',
repo_url + '/ext', '-m', 'copied')
# Until recently this took over the file external as 'E'xisting file, with
# a textual conflict.
expected_output = svntest.wc.State(wc_dir, {
'ext' : Item(verb='Skipped'),
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None, None)
def incoming_file_external_on_file(sbox):
"bring in a new file external over a file"
sbox.build()
wc_dir = sbox.wc_dir
change_external(sbox.wc_dir, "^/A/B/lambda iota\n")
# And bring in the file external
# Returns an error: WC status of external unchanged.
svntest.actions.run_and_verify_update(wc_dir, None, None, None,
'.*The file external.*overwrite.*')
def exclude_externals(sbox):
"try to exclude externals"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Checkout two working copies.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Excluding a file external should either fail (current behavior)
# or register the file external as excluded (preferred behavior)
svntest.actions.run_and_verify_update(sbox.ospath('A/B/gamma'),
None, None, None,
'.*Cannot exclude.*', False,
'--set-depth', 'exclude',
sbox.ospath('A/B/gamma'))
# Excluding a directory external should either fail (current behavior)
# or register the directory external as excluded (preferred behavior)
svntest.actions.run_and_verify_update(sbox.ospath('A/C/exdir_G'),
None, None, None,
'.*Cannot exclude.*', False,
'--set-depth', 'exclude',
sbox.ospath('A/C/exdir_G'))
# And after an update with --set-depth infinity all externals should
# be there again.
expected_status = svntest.actions.get_virginal_state(wc_dir, 6)
expected_status.add({
'A/B/gamma' : Item(status=' ', wc_rev='6', switched='X'),
'A/C/exdir_H' : Item(status=' ', prev_status='X ', wc_rev='1'),
'A/C/exdir_H/omega' : Item(status=' ', wc_rev='1'),
'A/C/exdir_H/chi' : Item(status=' ', wc_rev='1'),
'A/C/exdir_H/psi' : Item(status=' ', wc_rev='1'),
'A/C/exdir_G' : Item(status=' ', prev_status='X ', wc_rev='5'),
'A/C/exdir_G/pi' : Item(status=' ', wc_rev='5'),
'A/C/exdir_G/rho' : Item(status=' ', wc_rev='5'),
'A/C/exdir_G/tau' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A' : Item(status=' ', prev_status='X ', wc_rev='5'),
'A/D/exdir_A/H' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/H/psi' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/H/chi' : Item(status=' ', wc_rev='1'),
'A/D/exdir_A/H/omega': Item(status=' ', wc_rev='1'),
'A/D/exdir_A/D' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H/chi': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H/omega': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/H/psi': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G/pi': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G/rho': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/G/tau': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/D/gamma': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/F' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/E' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/E/beta': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/E/alpha': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/B/lambda': Item(status=' ', wc_rev='5'),
'A/D/exdir_A/C' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G/tau' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G/rho' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/G/pi' : Item(status=' ', wc_rev='5'),
'A/D/exdir_A/mu' : Item(status=' ', wc_rev='5'),
'A/D/x' : Item(status='X '),
'A/D/x/y/z/blah' : Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/E' : Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/E/alpha': Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/E/beta': Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/lambda': Item(status=' ', wc_rev='5'),
'A/D/x/y/z/blah/F' : Item(status=' ', wc_rev='5'),
})
svntest.actions.run_and_verify_update(wc_dir,
None, None, expected_status,
[], False,
'--set-depth', 'infinity', wc_dir)
def file_externals_different_url(sbox):
"update file externals via different url"
sbox.build()
wc_dir = sbox.wc_dir
r1_url = sbox.repo_url
r2_dir, r2_url = sbox.add_repo_path('2')
svntest.main.copy_repos(sbox.repo_dir, r2_dir, 1, 0)
sbox.simple_propset('svn:externals',
'r1-e-1 ' + r1_url + '/iota\n' +
r1_url + '/iota r1-e-2\n' +
'r2-e-1 ' + r2_url + '/iota\n' +
r2_url + '/iota r2-e-2\n' +
'^/iota rr-e-1\n', '')
# All file externals appear in the working copy, with normalised URLs.
expected_output = svntest.wc.State(wc_dir, {
'r1-e-1' : Item(status='A '),
'r1-e-2' : Item(status='A '),
'r2-e-1' : Item(status='A '),
'r2-e-2' : Item(status='A '),
'rr-e-1' : Item(status='A '),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('', status=' M')
expected_status.add({
'r2-e-1' : Item(status=' ', wc_rev='1', switched='X'),
'r1-e-1' : Item(status=' ', wc_rev='1', switched='X'),
'r1-e-2' : Item(status=' ', wc_rev='1', switched='X'),
'rr-e-1' : Item(status=' ', wc_rev='1', switched='X'),
'r2-e-2' : Item(status=' ', wc_rev='1', switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
expected_status)
# Verify that all file external URLs are descendants of r1_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
actions.run_and_verify_info([{'Repository Root' : r1_url}],
os.path.join(sbox.wc_dir, e))
svntest.actions.run_and_verify_svn(None, [],
'relocate', r1_url, r2_url, wc_dir)
# URLs of existing file externals are silently rewritten
expected_output = svntest.wc.State(wc_dir, {
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
expected_status)
# Verify that all file external URLs are descendants of r2_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
actions.run_and_verify_info([{'Repository Root' : r2_url}],
os.path.join(sbox.wc_dir, e))
def file_external_in_unversioned(sbox):
"file external in unversioned dir"
sbox.build()
wc_dir = sbox.wc_dir
sbox.simple_propset('svn:externals', '^/A/mu X/mu', 'A')
expected_output = svntest.wc.State(wc_dir, {
'A/X/mu' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None, None)
# At one point this failed with SVN_DEBUG wcng consistency checks enabled
svntest.actions.run_and_verify_svn(None, [], 'cleanup', wc_dir)
from svntest import verify, actions, main
@Issue(3589, 4000)
def copy_file_externals(sbox):
"a WC->WC copy should exclude file externals"
# svntest.factory.make(sbox,"""
# svn mkdir X
# ### manual edit: add '\n ^/A/mu xmu' to externals definition:
# svn ps svn:externals "^/iota xiota" X
# """)
sbox.build()
wc_dir = sbox.wc_dir
X = sbox.ospath('X')
# svn mkdir X
expected_stdout = ['A ' + X + '\n']
actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir', X)
# svn ps svn:externals "^/iota xiota" X
expected_stdout = ["property 'svn:externals' set on '" + X + "'\n"]
actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'svn:externals', '''
^/iota xiota
^/A/mu xmu
''', X)
# svntest.factory.make(sbox, '''
# svn ci
# svn up
# # have a commit on one of the files
# echo mod >> X/xmu
# svn ci X/xmu
# svn up
# # now perform the WC->WC copy
# svn cp X X_copy
# ### manual edit: add a verify_disk(check_props=True) here
# svn ci
# ### manual edit: add check_props=True to below update
# svn up
# ''')
X = sbox.ospath('X')
X_copy = sbox.ospath('X_copy')
X_xmu = sbox.ospath('X/xmu')
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'X' : Item(verb='Adding'),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'X' : Item(status=' ', wc_rev='2'),
})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'X/xmu' : Item(status='A '),
'X/xiota' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'X' : Item(),
'X/xiota' : Item(contents="This is the file 'iota'.\n"),
'X/xmu' : Item(contents="This is the file 'mu'.\n"),
})
expected_status.add({
'X/xiota' : Item(status=' ', wc_rev='2', switched='X'),
'X/xmu' : Item(status=' ', wc_rev='2', switched='X'),
})
expected_status.tweak(wc_rev='2')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# have a commit on one of the files
# echo mod >> X/xmu
main.file_append(X_xmu, 'mod\n')
# svn ci X/xmu
expected_output = svntest.wc.State(wc_dir, {
'X/xmu' : Item(verb='Sending'),
})
expected_status.tweak('X/xmu', wc_rev='3')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], X_xmu)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(status='U '),
})
expected_disk.tweak('A/mu', 'X/xmu',
contents="This is the file 'mu'.\nmod\n")
expected_status.tweak(wc_rev='3')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# now perform the WC->WC copy
# svn cp X X_copy
expected_stdout = ['A ' + X_copy + '\n']
actions.run_and_verify_svn2(expected_stdout, [], 0, 'cp', X,
X_copy)
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'X_copy' : Item(verb='Adding'),
})
expected_status.add({
'X_copy' : Item(status=' ', wc_rev='4'),
})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# verify disk state, also verifying props
expected_disk.add({
'X_copy' : Item(),
})
expected_disk.tweak('X', 'X_copy',
props={'svn:externals' : '\n ^/iota xiota\n ^/A/mu xmu\n \n'})
actions.verify_disk(wc_dir, expected_disk, True)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'X_copy/xmu' : Item(status='A '),
'X_copy/xiota' : Item(status='A '),
})
expected_disk.add({
'X_copy/xmu' : Item(contents="This is the file 'mu'.\nmod\n"),
'X_copy/xiota' : Item(contents="This is the file 'iota'.\n"),
})
expected_status.add({
'X_copy/xmu' : Item(status=' ', wc_rev='4', switched='X'),
'X_copy/xiota' : Item(status=' ', wc_rev='4', switched='X'),
})
expected_status.tweak(wc_rev='4')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status, check_props=True)
def commit_include_externals(sbox):
"commit --include-externals"
# svntest.factory.make(sbox, """
# mkdir Z
# echo 'This is the file zeta.' > Z/zeta
# svn add Z
# svn mkdir --parents Xpegged X/Y
# svn ci
# svn up
# svn ps svn:externals "^/Z xZ" A/D/H
# svn ps svn:externals "^/iota@1 Xpegged/xiota" wc_dir
# # ^^^ manually set externals to:
# # ^/iota@1 Xpegged/xiota
# # -r1 ^/A/B/E Xpegged/xE
# # ^/A/mu X/xmu
# # ^/A/B/lambda X/Y/xlambda
# # ^/A/D/G X/xG
# # ^/A/D/H X/Y/xH
# """)
# exit(0)
sbox.build()
wc_dir = sbox.wc_dir
A_D_H = sbox.ospath('A/D/H')
X = sbox.ospath('X')
X_Y = sbox.ospath('X/Y')
Xpegged = sbox.ospath('Xpegged')
Z = sbox.ospath('Z')
Z_zeta = sbox.ospath('Z/zeta')
# mkdir Z
os.makedirs(Z)
# echo 'This is the file zeta.' > Z/zeta
main.file_write(Z_zeta, 'This is the file zeta.\n')
# svn add Z
expected_stdout = verify.UnorderedOutput([
'A ' + Z + '\n',
'A ' + Z_zeta + '\n',
])
actions.run_and_verify_svn2(expected_stdout, [], 0, 'add', Z)
# svn mkdir --parents Xpegged X/Y
expected_stdout = verify.UnorderedOutput([
'A ' + Xpegged + '\n',
'A ' + X + '\n',
'A ' + X_Y + '\n',
])
actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
'--parents', Xpegged, X_Y)
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'Z' : Item(verb='Adding'),
'Z/zeta' : Item(verb='Adding'),
'X' : Item(verb='Adding'),
'X/Y' : Item(verb='Adding'),
'Xpegged' : Item(verb='Adding'),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'Z' : Item(status=' ', wc_rev='2'),
'Z/zeta' : Item(status=' ', wc_rev='2'),
'X' : Item(status=' ', wc_rev='2'),
'X/Y' : Item(status=' ', wc_rev='2'),
'Xpegged' : Item(status=' ', wc_rev='2'),
})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'Z' : Item(),
'Z/zeta' : Item(contents="This is the file zeta.\n"),
'Xpegged' : Item(),
'X' : Item(),
'X/Y' : Item(),
})
expected_status.tweak(wc_rev='2')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# svn ps svn:externals "^/Z xZ" A/D/H
expected_stdout = ["property 'svn:externals' set on '" + A_D_H + "'\n"]
actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'svn:externals', '^/Z xZ', A_D_H)
# svn ps svn:externals "^/iota@1 Xpegged/xiota" wc_dir
expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'svn:externals',
'''
^/iota@1 Xpegged/xiota
-r1 ^/A/B/E Xpegged/xE
^/A/mu X/xmu
^/A/B/lambda X/Y/xlambda
^/A/D/G X/xG
^/A/D/H X/Y/xH
''', wc_dir)
# svntest.factory.make(sbox, prev_disk=expected_disk,
# prev_status=expected_status,
# commands = """
# svn ci
# svn up
# echo mod >> Xpegged/xE/alpha
# echo mod >> X/xmu
# echo mod >> X/Y/xlambda
# echo mod >> X/xG/pi
# echo mod >> X/Y/xH/chi
# echo mod >> X/Y/xH/xZ/zeta
# svn status
# # Expect no externals to be committed
# svn ci
# # Expect no externals to be committed, because pegged
# svn ci --include-externals Xpegged
# # Expect no externals to be committed, because of depth
# svn ci --depth=immediates --include-externals
# # Expect only unpegged externals to be committed (those in X/)
# svn ci --include-externals
# # ### Below, manually add:
# # expected_status.tweak('A/D/H/xZ', 'Xpegged/xE', 'X/Y/xH', 'X/xG',
# # wc_rev=None)
# svn up
# # new mods to check more cases
# echo mod >> X/xmu
# echo mod >> X/Y/xlambda
# echo mod >> X/xG/pi
# echo mod >> X/Y/xH/chi
# echo mod >> X/Y/xH/xZ/zeta
# svn status
# # Expect no externals to be committed, because of depth
# svn ci --include-externals --depth=empty X
# # Expect only file external xmu to be committed, because of depth
# svn ci --include-externals --depth=files X
# svn status
# # ### Below, manually add:
# # expected_status.tweak('A/D/H/xZ', 'Xpegged/xE', 'X/Y/xH', 'X/xG',
# # wc_rev=None)
# svn up
# echo mod >> X/xG/pi
# svn status
# # Expect explicit targets to be committed
# svn ci X/Y/xlambda X/xG
# svn status
# """)
X = sbox.ospath('X')
X_xG = sbox.ospath('X/xG')
X_xG_pi = sbox.ospath('X/xG/pi')
X_xmu = sbox.ospath('X/xmu')
X_Y_xH_chi = sbox.ospath('X/Y/xH/chi')
X_Y_xH_xZ_zeta = sbox.ospath('X/Y/xH/xZ/zeta')
X_Y_xlambda = sbox.ospath('X/Y/xlambda')
Xpegged = sbox.ospath('Xpegged')
Xpegged_xE_alpha = sbox.ospath('Xpegged/xE/alpha')
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'' : Item(verb='Sending'),
'A/D/H' : Item(verb='Sending'),
})
expected_status.tweak('', 'A/D/H', wc_rev='3')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'X/xmu' : Item(status='A '),
'X/xG/tau' : Item(status='A '),
'X/xG/rho' : Item(status='A '),
'X/xG/pi' : Item(status='A '),
'X/Y/xH' : Item(status=' U'),
'X/Y/xH/psi' : Item(status='A '),
'X/Y/xH/xZ/zeta' : Item(status='A '),
'X/Y/xH/chi' : Item(status='A '),
'X/Y/xH/omega' : Item(status='A '),
'X/Y/xlambda' : Item(status='A '),
'A/D/H/xZ/zeta' : Item(status='A '),
'Xpegged/xiota' : Item(status='A '),
'Xpegged/xE/alpha' : Item(status='A '),
'Xpegged/xE/beta' : Item(status='A '),
})
expected_disk.add({
'Xpegged/xE' : Item(),
'Xpegged/xE/beta' : Item(contents="This is the file 'beta'.\n"),
'Xpegged/xE/alpha' : Item(contents="This is the file 'alpha'.\n"),
'Xpegged/xiota' : Item(contents="This is the file 'iota'.\n"),
'A/D/H/xZ' : Item(),
'A/D/H/xZ/zeta' : Item(contents="This is the file zeta.\n"),
'X/Y/xlambda' : Item(contents="This is the file 'lambda'.\n"),
'X/Y/xH' : Item(),
'X/Y/xH/chi' : Item(contents="This is the file 'chi'.\n"),
'X/Y/xH/xZ' : Item(),
'X/Y/xH/xZ/zeta' : Item(contents="This is the file zeta.\n"),
'X/Y/xH/psi' : Item(contents="This is the file 'psi'.\n"),
'X/Y/xH/omega' : Item(contents="This is the file 'omega'.\n"),
'X/xmu' : Item(contents="This is the file 'mu'.\n"),
'X/xG' : Item(),
'X/xG/tau' : Item(contents="This is the file 'tau'.\n"),
'X/xG/rho' : Item(contents="This is the file 'rho'.\n"),
'X/xG/pi' : Item(contents="This is the file 'pi'.\n"),
})
expected_status.tweak(wc_rev='3')
expected_status.add({
'A/D/H/xZ' : Item(status=' ', prev_status='X ', wc_rev='3'),
'A/D/H/xZ/zeta' : Item(status=' ', wc_rev='3'),
'Xpegged/xiota' : Item(status=' ', wc_rev='1', switched='X'),
'Xpegged/xE' : Item(status=' ', prev_status='X ', wc_rev='1'),
'Xpegged/xE/alpha' : Item(status=' ', wc_rev='1'),
'Xpegged/xE/beta' : Item(status=' ', wc_rev='1'),
'X/Y/xH' : Item(status=' ', prev_status='X ', wc_rev='3'),
'X/Y/xH/psi' : Item(status=' ', wc_rev='3'),
'X/Y/xH/omega' : Item(status=' ', wc_rev='3'),
'X/Y/xH/chi' : Item(status=' ', wc_rev='3'),
'X/Y/xH/xZ' : Item(status=' ', prev_status='X ', wc_rev='3'),
'X/Y/xH/xZ/zeta' : Item(status=' ', wc_rev='3'),
'X/Y/xlambda' : Item(status=' ', wc_rev='3', switched='X'),
'X/xmu' : Item(status=' ', wc_rev='3', switched='X'),
'X/xG' : Item(status=' ', prev_status='X ', wc_rev='3'),
'X/xG/rho' : Item(status=' ', wc_rev='3'),
'X/xG/tau' : Item(status=' ', wc_rev='3'),
'X/xG/pi' : Item(status=' ', wc_rev='3'),
})
expected_status.tweak('Xpegged/xiota', wc_rev='1')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# echo mod >> Xpegged/xE/alpha
main.file_append(Xpegged_xE_alpha, 'mod\n')
# echo mod >> X/xmu
main.file_append(X_xmu, 'mod\n')
# echo mod >> X/Y/xlambda
main.file_append(X_Y_xlambda, 'mod\n')
# echo mod >> X/xG/pi
main.file_append(X_xG_pi, 'mod\n')
# echo mod >> X/Y/xH/chi
main.file_append(X_Y_xH_chi, 'mod\n')
# echo mod >> X/Y/xH/xZ/zeta
main.file_append(X_Y_xH_xZ_zeta, 'mod\n')
# svn status
expected_status.tweak('X/Y/xlambda', 'X/xmu', 'X/Y/xH/chi',
'X/Y/xH/xZ/zeta', 'Xpegged/xE/alpha',
'X/xG/pi', status='M ')
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
# Expect no externals to be committed
# svn ci
expected_output = svntest.wc.State(wc_dir, {})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# Expect no externals to be committed, because pegged
# svn ci --include-externals Xpegged
expected_output = svntest.wc.State(wc_dir, {})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], '--include-externals', Xpegged)
# Expect no externals to be committed, because of depth
# svn ci --depth=immediates --include-externals
expected_output = svntest.wc.State(wc_dir, {})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], '--depth=immediates', '--include-externals', wc_dir)
# Expect only unpegged externals to be committed (those in X/)
# svn ci --include-externals
expected_output = svntest.wc.State(wc_dir, {
'X/xmu' : Item(verb='Sending'),
'X/Y/xlambda' : Item(verb='Sending'),
'X/Y/xH/xZ/zeta' : Item(verb='Sending'),
'X/Y/xH/chi' : Item(verb='Sending'),
'X/xG/pi' : Item(verb='Sending'),
})
expected_status.tweak(status=' ')
expected_status.tweak('X/xmu', 'X/Y/xlambda', 'X/Y/xH/xZ/zeta',
'X/Y/xH/chi', 'X/xG/pi', wc_rev='4')
expected_status.tweak('Xpegged/xE/alpha', status='M ')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], '--include-externals', wc_dir)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(status='U '),
'A/D/H/chi' : Item(status='U '),
'A/D/H/xZ/zeta' : Item(status='U '),
'A/D/G/pi' : Item(status='U '),
'A/B/lambda' : Item(status='U '),
'Z/zeta' : Item(status='U '),
})
expected_disk.tweak('Xpegged/xE/alpha',
contents="This is the file 'alpha'.\nmod\n")
expected_disk.tweak('A/D/H/chi', 'X/Y/xH/chi',
contents="This is the file 'chi'.\nmod\n")
expected_disk.tweak('A/D/H/xZ/zeta', 'X/Y/xH/xZ/zeta', 'Z/zeta',
contents='This is the file zeta.\nmod\n')
expected_disk.tweak('A/D/G/pi', 'X/xG/pi',
contents="This is the file 'pi'.\nmod\n")
expected_disk.tweak('A/mu', 'X/xmu',
contents="This is the file 'mu'.\nmod\n")
expected_disk.tweak('A/B/lambda', 'X/Y/xlambda',
contents="This is the file 'lambda'.\nmod\n")
# Assume everything r4, except what is pegged
expected_status.tweak(wc_rev='4')
expected_status.tweak('Xpegged/xiota', 'Xpegged/xE', 'Xpegged/xE/alpha',
'Xpegged/xE/beta', wc_rev=1)
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# new mods to check more cases
# echo mod >> X/xmu
main.file_append(X_xmu, 'mod\n')
# echo mod >> X/Y/xlambda
main.file_append(X_Y_xlambda, 'mod\n')
# echo mod >> X/xG/pi
main.file_append(X_xG_pi, 'mod\n')
# echo mod >> X/Y/xH/chi
main.file_append(X_Y_xH_chi, 'mod\n')
# echo mod >> X/Y/xH/xZ/zeta
main.file_append(X_Y_xH_xZ_zeta, 'mod\n')
# svn status
expected_status.tweak('X/Y/xlambda', 'X/xmu', 'X/xG/pi',
'X/Y/xH/chi', 'X/Y/xH/xZ/zeta', status='M ')
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
# Expect no externals to be committed, because of depth
# svn ci --include-externals --depth=empty X
expected_output = svntest.wc.State(wc_dir, {})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], '--include-externals', '--depth=empty', X)
# Expect only file external xmu to be committed, because of depth
# svn ci --include-externals --depth=files X
expected_output = svntest.wc.State(wc_dir, {
'X/xmu' : Item(verb='Sending'),
})
expected_status.tweak(status=' ')
expected_status.tweak('X/xmu', wc_rev='5')
expected_status.tweak('X/Y/xlambda', 'X/xG/pi', 'X/Y/xH/chi',
'X/Y/xH/xZ/zeta', 'Xpegged/xE/alpha', status='M ')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], '--include-externals', '--depth=files', X)
# svn status
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(status='U '),
})
expected_disk.tweak('A/mu', 'X/xmu',
contents="This is the file 'mu'.\nmod\nmod\n")
expected_disk.tweak('X/Y/xlambda',
contents="This is the file 'lambda'.\nmod\nmod\n")
expected_disk.tweak('X/Y/xH/chi',
contents="This is the file 'chi'.\nmod\nmod\n")
expected_disk.tweak('X/Y/xH/xZ/zeta',
contents='This is the file zeta.\nmod\nmod\n')
expected_disk.tweak('X/xG/pi',
contents="This is the file 'pi'.\nmod\nmod\n")
expected_status.tweak(wc_rev='5')
expected_status.tweak('Xpegged/xiota', wc_rev='1')
expected_status.tweak('Xpegged/xiota', 'Xpegged/xE', 'Xpegged/xE/alpha',
'Xpegged/xE/beta', wc_rev=1)
expected_status.tweak('X/Y/xH/chi', status='M ')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# echo mod >> X/xG/pi
main.file_append(X_xG_pi, 'mod\n')
# svn status
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
# Expect explicit targets to be committed
# svn ci X/Y/xlambda X/xG
expected_output = svntest.wc.State(wc_dir, {
'X/Y/xlambda' : Item(verb='Sending'),
'X/xG/pi' : Item(verb='Sending'),
})
expected_status.tweak(status=' ')
expected_status.tweak('X/Y/xlambda', 'X/xG/pi', wc_rev='6')
expected_status.tweak('X/Y/xH/chi', 'X/Y/xH/xZ/zeta', 'Xpegged/xE/alpha',
status='M ')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], X_Y_xlambda, X_xG)
# svn status
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
@Issue(4252)
def include_immediate_dir_externals(sbox):
"commit --include-externals --depth=immediates"
# See also comment in append_externals_as_explicit_targets() in
# libsvn_client/commit.c, from r1198765.
# svntest.factory.make(sbox,"""
# svn mkdir X
# svn ci
# svn up
# svn ps svn:externals "^/A/B/E X/XE" wc_dir
# svn ci
# svn up
#
# svn ps some change X/XE
# echo mod >> X/XE/alpha
#
# svn st X/XE
# # Expect only the propset on X/XE to be committed.
# # Should be like 'svn commit --include-externals --depth=empty X/XE'.
# svn commit --include-externals --depth=immediates X
# """)
sbox.build()
wc_dir = sbox.wc_dir
X = sbox.ospath('X')
X_XE = sbox.ospath('X/XE')
X_XE_alpha = sbox.ospath('X/XE/alpha')
# svn mkdir X
expected_stdout = ['A ' + X + '\n']
actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir', X)
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'X' : Item(verb='Adding'),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'X' : Item(status=' ', wc_rev='2'),
})
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'X' : Item(),
})
expected_status.tweak(wc_rev='2')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# svn ps svn:externals "^/A/B/E X/XE" wc_dir
expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'svn:externals', '^/A/B/E X/XE', wc_dir)
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'' : Item(verb='Sending'),
})
expected_status.tweak('', wc_rev='3')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'X/XE/alpha' : Item(status='A '),
'X/XE/beta' : Item(status='A '),
})
expected_disk.add({
'X/XE' : Item(),
'X/XE/alpha' : Item(contents="This is the file 'alpha'.\n"),
'X/XE/beta' : Item(contents="This is the file 'beta'.\n"),
})
expected_status.tweak(wc_rev='3')
expected_status.add({
'X/XE' : Item(status=' ', prev_status='X ', wc_rev='3'),
'X/XE/beta' : Item(status=' ', wc_rev='3'),
'X/XE/alpha' : Item(status=' ', wc_rev='3'),
})
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
sbox.simple_propset('some', 'change', 'X/XE')
# echo mod >> X/XE/alpha
main.file_append(X_XE_alpha, 'mod\n')
# svn st X/XE
expected_status.tweak('X/XE', status=' M')
expected_status.tweak('X/XE/alpha', status='M ')
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
# Expect only the propset on X/XE to be committed.
# Should be like 'svn commit --include-externals --depth=empty X/XE'.
# svn commit --include-externals --depth=immediates X
expected_output = svntest.wc.State(wc_dir, {
'X/XE' : Item(verb='Sending'),
})
expected_status.tweak('X/XE', status=' ', wc_rev=4)
# Currently this fails because nothing is committed.
#
# >svn st
# X X\XE
#
# Performing status on external item at 'X\XE':
# M C:\SVN\src-trunk\...\externals_tests-37\X\XE
# M C:\SVN\src-trunk\...\externals_tests-37\X\XE\alpha
#
# >svn ci -m "m" --include-externals --depth immediates X
#
# >
actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
[], '--include-externals', '--depth=immediates', X)
@Issue(4085)
def shadowing(sbox):
"external shadows an existing dir"
sbox.build()
wc_dir = sbox.wc_dir
# Setup external: /A/B/F as 'C' child of /A
externals_prop = "^/A/B/F C\n"
change_external(sbox.ospath('A'), externals_prop, commit=False)
# An update errors out because the external is shadowed by an existing dir
svntest.main.run_svn("W205011: Error handling externals definition for '%s'"
% (sbox.wc_dir) + "/A/C", 'update', wc_dir)
# Remove the shadowed directory to unblock the external
svntest.main.run_svn(None, 'rm', sbox.repo_url + '/A/C', '-m', 'remove A/C')
# The next update should fetch the external and not error out
sbox.simple_update()
# Test for issue #4093 'remapping a file external can segfault due to
# "deleted" props'.
@Issue(4093)
def remap_file_external_with_prop_del(sbox):
"file external remap segfaults due to deleted props"
sbox.build()
wc_dir = sbox.wc_dir
A_path = sbox.ospath('A')
mu_path = sbox.ospath('A/mu')
# Add a property to A/mu
svntest.actions.run_and_verify_svn(None, [],
'ps', 'propname', 'propval', mu_path)
svntest.actions.run_and_verify_svn(None, [],
'commit', '-m', 'New property on a file',
wc_dir)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Add a new file external A/external pointing to ^/A/mu
externals_prop = "^/A/mu external\n"
change_external(A_path, externals_prop)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Change A/external to point to ^/iota
externals_prop = "^/iota external\n"
change_external(A_path, externals_prop)
# Now update to bring the new external down.
# This previously segfaulted as described in
# http://subversion.tigris.org/issues/show_bug.cgi?id=4093#desc1
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Test for issue #4053 'svn:externals with explicit rev checks out HEAD'
@Issue(4053)
def dir_external_with_dash_r_only(sbox):
"whether '-r1 ^/A B' updates properly"
# svntest.factory.make(sbox,"""
# echo 'newer alpha' > A/B/E/alpha
# svn ci
# svn ps svn:externals ' -r1 ^/A/B/E E_ext' .
# svn up
# # ^ move the 'status.tweak(wc_rev=2)' above the 'add()' call
# svn info E_ext
# # ^ change the 'svn info' call to
# # expected_info = { 'Revision': '1' }
# # actions.run_and_verify_info([expected_info], E_ext)
# """)
sbox.build()
wc_dir = sbox.wc_dir
url = sbox.repo_url
A_B_E_alpha = sbox.ospath('A/B/E/alpha')
E_ext = sbox.ospath('E_ext')
# echo 'newer alpha' > A/B/E/alpha
main.file_write(A_B_E_alpha, 'newer alpha\n')
# svn ci
expected_output = svntest.wc.State(wc_dir, {
'A/B/E/alpha' : Item(verb='Sending'),
})
expected_status = actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E/alpha', wc_rev='2')
actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn ps svn:externals ' -r1 ^/A/B/E E_ext' .
expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'svn:externals', ' -r1 ^/A/B/E E_ext', wc_dir)
# svn up
expected_output = svntest.wc.State(wc_dir, {
'E_ext/beta' : Item(status='A '),
'E_ext/alpha' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'E_ext' : Item(),
'E_ext/alpha' : Item(contents="This is the file 'alpha'.\n"),
'E_ext/beta' : Item(contents="This is the file 'beta'.\n"),
})
expected_disk.tweak('A/B/E/alpha', contents='newer alpha\n')
expected_status.tweak(wc_rev='2')
expected_status.tweak('', status=' M')
expected_status.add({
'E_ext' : Item(status=' ', prev_status='X ', wc_rev=1),
'E_ext/beta' : Item(status=' ', wc_rev='1'),
'E_ext/alpha' : Item(status=' ', wc_rev='1'),
})
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
expected_status)
# svn info E_ext/alpha
expected_info = { 'Revision': '1' }
actions.run_and_verify_info([expected_info], E_ext)
# Test for issue #4123 'URL-to-WC copy of externals fails on Windows'
@Issue(4123)
def url_to_wc_copy_of_externals(sbox):
"url-to-wc copy of externals"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create an external A/C/external pointing to ^/A/D/G.
svntest.actions.run_and_verify_svn(None, [], 'ps',
'svn:externals', '^/A/D/G external',
sbox.ospath('A/C'))
svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
'create an external', wc_dir)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy ^/A/C to External-WC-to-URL-Copy.
#
# Previously this failed with:
# >svn copy ^^/A/C External-WC-to-URL-Copy
# U External-WC-to-URL-Copy
#
# Fetching external item into 'External-WC-to-URL-Copy\external':
# A External-WC-to-URL-Copy\external\pi
# A External-WC-to-URL-Copy\external\rho
# A External-WC-to-URL-Copy\external\tau
# Checked out external at revision 2.
#
# Checked out revision 2.
# ..\..\..\subversion\libsvn_client\copy.c:2249: (apr_err=720005)
# ..\..\..\subversion\libsvn_client\copy.c:1857: (apr_err=720005)
# ..\..\..\subversion\libsvn_client\copy.c:1857: (apr_err=720005)
# ..\..\..\subversion\libsvn_client\copy.c:1737: (apr_err=720005)
# ..\..\..\subversion\libsvn_client\copy.c:1737: (apr_err=720005)
# ..\..\..\subversion\libsvn_client\copy.c:1537: (apr_err=720005)
# ..\..\..\subversion\libsvn_subr\io.c:3416: (apr_err=720005)
# svn: E720005: Can't move 'C:\SVN\src-trunk-3\Debug\subversion\tests\
# cmdline\svn-test-work\working_copies\externals_tests-41\.svn\tmp\
# svn-F9E2C0EC' to 'C:\SVN\src-trunk-3\Debug\subversion\tests\cmdline\
# svn-test-work\working_copies\externals_tests-41\External-WC-to-URL-Copy':
# Access is denied.
external_root_path = sbox.ospath('External-WC-to-URL-Copy')
external_ex_path = os.path.join(wc_dir, "External-WC-to-URL-Copy",
"external")
external_pi_path = os.path.join(wc_dir, "External-WC-to-URL-Copy",
"external", "pi")
external_rho_path = os.path.join(wc_dir, "External-WC-to-URL-Copy",
"external", "rho")
external_tau_path = os.path.join(wc_dir, "External-WC-to-URL-Copy",
"external", "tau")
expected_stdout = verify.UnorderedOutput([
" U " + external_root_path + "\n",
"\n",
"Fetching external item into '" + external_ex_path + "':\n",
"A " + external_pi_path + "\n",
"A " + external_rho_path + "\n",
"A " + external_tau_path + "\n",
"Checked out external at revision 2.\n",
"\n",
"Checked out revision 2.\n",
"A " + external_root_path + "\n"
])
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
expected_stdout, [], 0, 'copy', repo_url + '/A/C',
sbox.ospath('External-WC-to-URL-Copy'))
@Issue(4227)
def duplicate_targets(sbox):
"local path appears twice in one svn:external prop"
if False:
svntest.factory.make(sbox, r"""
svn ps svn:externals "^/A/B/E barf\n^/A/B/E barf" .
svn ps svn:externals "^/A/B/E barf\n^/A/D/G barf" .
svn ps svn:externals "^/A/B/E barf/.\n^/A/D/G ./barf" .
svn ps svn:externals "^/A/B/E ././barf\n^/A/D/G .//barf" .
svn pg svn:externals .
svn ps svn:externals "^/A/B/E ok" .
svn pg svn:externals .
""")
sbox.build()
wc_dir = sbox.wc_dir
abs_wc_dir = os.path.abspath(sbox.wc_dir)
expected_stderr = verify.RegexOutput(
".*Invalid svn:externals property on '" + re.escape(abs_wc_dir) +
"': target 'barf' appears more than once\n",
match_all=False)
# svn ps svn:externals "^/A/B/E barf\n^/A/B/E barf" .
actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
'svn:externals', '^/A/B/E barf\n^/A/B/E barf', wc_dir)
# svn ps svn:externals "^/A/B/E barf\n^/A/D/G barf" .
actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
'svn:externals', '^/A/B/E barf\n^/A/D/G barf', wc_dir)
# svn ps svn:externals "^/A/B/E barf/.\n^/A/D/G ./barf" .
actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
'svn:externals', '^/A/B/E barf/.\n^/A/D/G ./barf', wc_dir)
# svn ps svn:externals "^/A/B/E ././barf\n^/A/D/G .//barf" .
actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
'svn:externals', '^/A/B/E ././barf\n^/A/D/G .//barf', wc_dir)
# svn pg svn:externals .
expected_stderr = '.*W200017: Property.*not found'
actions.run_and_verify_svn2([], expected_stderr, 1, 'pg',
'svn:externals', wc_dir)
# svn ps svn:externals "^/A/B/E ok" .
expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'svn:externals', '^/A/B/E ok', wc_dir)
# svn pg svn:externals .
expected_stdout = verify.UnorderedOutput([
'^/A/B/E ok\n',
'\n'
])
actions.run_and_verify_svn2(expected_stdout, [], 0, 'pg',
'svn:externals', wc_dir)
@Issue(4225)
def list_include_externals(sbox):
"list with --include-externals"
externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
B_path = sbox.ospath("A/B")
C_path = sbox.ospath("A/C")
B_url = repo_url + "/A/B"
C_url = repo_url + "/A/C"
def list_external_string(path, url):
string = "Listing external" + " '" + path + "' " + "defined on" + " '" + \
url + "'" + ":"
return string
expected_stdout = verify.UnorderedOutput([
"E/" + "\n",
"F/" + "\n",
"lambda" + "\n",
list_external_string("gamma", B_url ) + "\n",
"gamma" + "\n"])
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
expected_stdout, [], 0, 'ls', '--include-externals', B_path)
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
expected_stdout, [], 0, 'ls', '--include-externals', B_url)
expected_stdout = verify.UnorderedOutput([
list_external_string("exdir_G", C_url)+ "\n",
"pi" + "\n",
"rho" + "\n",
"tau" + "\n",
list_external_string("exdir_H", C_url) + "\n",
"chi" + "\n",
"omega" + "\n",
"psi" + "\n"])
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
expected_stdout, [], 0, 'ls', '--include-externals', C_path)
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
expected_stdout, [], 0, 'ls', '--include-externals', C_url)
@Issue(4293)
@XFail()
def move_with_file_externals(sbox):
"move with file externals"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
sbox.simple_propset('svn:externals', '^/A/mu@1 mu-1\n', 'A/D')
sbox.simple_commit()
sbox.simple_update()
sbox.simple_move('A/D', 'A/D_moved')
sbox.simple_commit()
sbox.simple_update()
@Issue(4185,4529)
def pinned_externals(sbox):
"pinned external"
sbox.build()
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create X in r2
sbox.simple_copy('A', 'X')
sbox.simple_mkdir('Z')
sbox.simple_commit('')
repo_X_C = repo_url + '/X/C'
repo_X_mu = repo_url + '/X/mu'
expected_output = verify.RegexOutput(
'^ 1 jrandom .* mu$'
)
svntest.actions.run_and_verify_svn(expected_output, [],
'list', repo_X_mu, '-v')
# So, we copied A/mu to X/mu in r2, but its last changed revision is
# still r1. It existed as A/mu at r1.
# In the old format the -r is interpreted like an @1 on checkout.
sbox.simple_propset('svn:externals',
'old-plain ' + repo_X_mu + '\n' +
'old-rev -r 1 ' + repo_X_mu + '\n' +
repo_X_mu + ' new-plain\n' +
'-r1 ' + repo_X_mu + ' new-rev\n' +
repo_X_mu + '@1 new-peg\n'
'-r1 ' + repo_X_C + ' new-dir-rev\n',
'Z')
expected_error = "svn: E205011: Failure.*externals"
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
# The interesting values
'Z/old-plain' : Item(contents="This is the file 'mu'.\n"),
'Z/new-plain' : Item(contents="This is the file 'mu'.\n"),
'Z/new-rev' : Item(contents="This is the file 'mu'.\n"),
'Z/new-dir-rev' : Item(),
# And verifying X
'X/D/H/psi' : Item(contents="This is the file 'psi'.\n"),
'X/D/H/chi' : Item(contents="This is the file 'chi'.\n"),
'X/D/H/omega' : Item(contents="This is the file 'omega'.\n"),
'X/D/G/tau' : Item(contents="This is the file 'tau'.\n"),
'X/D/G/pi' : Item(contents="This is the file 'pi'.\n"),
'X/D/G/rho' : Item(contents="This is the file 'rho'.\n"),
'X/D/gamma' : Item(contents="This is the file 'gamma'.\n"),
'X/B/E/alpha' : Item(contents="This is the file 'alpha'.\n"),
'X/B/E/beta' : Item(contents="This is the file 'beta'.\n"),
'X/B/lambda' : Item(contents="This is the file 'lambda'.\n"),
'X/B/F' : Item(),
'X/C' : Item(),
'X/mu' : Item(contents="This is the file 'mu'.\n"),
})
# ### Would be nice if verify update would still verify the result
# on exiting with an error. Why would you pass it?
svntest.actions.run_and_verify_update(wc_dir, None, None, None,
expected_error)
svntest.actions.verify_disk(wc_dir, expected_disk)
# Test for issue #3741 'externals not removed when working copy is made shallow'
@Issue(3741)
def update_dir_external_shallow(sbox):
"shallow update should remove externals"
sbox.build()
# Create an external in r2
sbox.simple_propset('svn:externals', '^/A/D/H X', 'A/B/E')
sbox.simple_commit()
sbox.simple_update()
# Now make A/B/E shallow by updating with "--set-depth empty"
expected_output = svntest.wc.State(sbox.wc_dir, {
'A/B/E/alpha' : Item(status='D '),
'A/B/E/X' : Item(verb='Removed external'),
'A/B/E/beta' : Item(status='D '),
})
svntest.actions.run_and_verify_update(sbox.wc_dir,
expected_output, None, None,
[], False,
'--set-depth=empty',
sbox.ospath('A/B/E'))
# And bring the external back by updating with "--set-depth infinity"
expected_output = svntest.wc.State(sbox.wc_dir, {
'A/B/E/X/psi' : Item(status='A '),
'A/B/E/X/chi' : Item(status='A '),
'A/B/E/X/omega' : Item(status='A '),
'A/B/E/alpha' : Item(status='A '),
'A/B/E/beta' : Item(status='A '),
})
svntest.actions.run_and_verify_update(sbox.wc_dir,
expected_output, None, None,
[], False,
'--set-depth=infinity',
sbox.ospath('A/B/E'))
@Issue(4411)
def switch_parent_relative_file_external(sbox):
"switch parent-relative file external"
sbox.build()
# Create a parent-relative file external in r2
sbox.simple_propset('svn:externals', '../D/gamma gamma-ext', 'A/B')
sbox.simple_commit()
sbox.simple_update()
# Create a branch that contains the file external
sbox.simple_copy('A', 'A_copy')
sbox.simple_commit()
sbox.simple_update()
# Check out A/B_copy to a new working copy
branch_wc = sbox.add_wc_path("branch")
branch_url = sbox.repo_url + '/A_copy'
svntest.actions.run_and_verify_svn(None, [],
'checkout', branch_url,
branch_wc)
# Rename the branch
sbox.simple_move('A_copy', 'A_copy2')
sbox.simple_commit()
# Switch the branch working copy to the new branch URL
new_branch_url = sbox.repo_url + '/A_copy2'
svntest.actions.run_and_verify_svn(None, [],
'switch', new_branch_url,
branch_wc)
# Bug: The branch working copy can no longer be updated.
svntest.actions.run_and_verify_svn(None, [],
'update', branch_wc)
@Issue(4420)
def file_external_unversioned_obstruction(sbox):
"""file externals unversioned obstruction"""
sbox.build()
wc_dir = sbox.wc_dir
expected_output = verify.RegexOutput(b'r2 committed .*')
svntest.actions.run_and_verify_svnmucc(expected_output, [],
'-U', sbox.repo_url, '-m', 'r2: set external',
'propset', 'svn:externals', '^/A/mu mu-ext', 'A')
sbox.simple_append('A/mu-ext', 'unversioned obstruction')
# Update reports a tree-conflict but status doesn't show any such
# conflict. I'm no sure whether this is correct.
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/mu-ext' : Item('unversioned obstruction'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
svntest.actions.run_and_verify_svn(
None,
".*svn: warning: W155014: The file external '.*mu-ext'"
" can not be created because the node exists.*",
'up', wc_dir)
svntest.actions.verify_disk(wc_dir, expected_disk)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
os.remove(sbox.ospath('A/mu-ext'))
expected_output = svntest.wc.State(wc_dir, {
'A/mu-ext' : Item(status='A '),
})
expected_status.add({
'A/mu-ext' : Item(status=' ', wc_rev='2', switched='X'),
})
expected_disk.tweak('A/mu-ext', contents="This is the file 'mu'.\n")
svntest.actions.run_and_verify_update(wc_dir,
expected_output, expected_disk,
expected_status)
@Issue(4001)
@XFail()
def file_external_versioned_obstruction(sbox):
"""file externals versioned obstruction"""
sbox.build()
wc_dir = sbox.wc_dir
expected_output = verify.RegexOutput('r2 committed .*')
svntest.actions.run_and_verify_svnmucc(expected_output, [],
'-U', sbox.repo_url, '-m', 'r2: set external',
'propset', 'svn:externals', '^/A/mu mu-ext', 'A')
expected_output = svntest.wc.State(wc_dir, {
'A' : Item(status=' U'),
'A/mu-ext' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/mu-ext' : Item('This is the file \'mu\'.\n'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/mu-ext' : Item(status=' ', wc_rev='2', switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, expected_disk,
expected_status)
# Update skips adding the versioned node because of the file
# external obstruction then when the external is deleted the
# versioned node is missing from disk and wc.db. Not really sure
# what should happen, perhaps a not-present node?
expected_output = verify.RegexOutput('r3 committed .*')
svntest.actions.run_and_verify_svnmucc(expected_output, [],
'-U', sbox.repo_url, '-m', 'r3: copy file',
'cp', 'head', 'A/mu', 'A/mu-ext',
'propdel', 'svn:externals', 'A')
expected_output = svntest.wc.State(wc_dir, {
'A' : Item(status=' U'),
'A/mu-ext' : Item(verb='Removed external', prev_verb='Skipped'),
})
expected_disk.tweak('A/mu-ext', content='This is the file \'mu\'.\n')
expected_status.tweak(wc_rev=3)
expected_status.tweak('A/mu-ext', switched=None)
svntest.actions.run_and_verify_update(wc_dir,
expected_output, expected_disk,
expected_status)
@Issue(4495)
def update_external_peg_rev(sbox):
"update external peg rev"
sbox.build()
wc_dir = sbox.wc_dir
sbox.simple_rm('A/B/E/alpha')
sbox.simple_commit()
sbox.simple_update()
sbox.simple_propset('svn:externals', '^/A/B/E@1 xE', 'A/B/F')
sbox.simple_commit()
expected_output = svntest.wc.State(wc_dir, {
'A/B/F/xE/alpha' : Item(status='A '),
'A/B/F/xE/beta' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/B/E/alpha')
expected_disk.add({
'A/B/F/xE' : Item(),
'A/B/F/xE/alpha' : Item('This is the file \'alpha\'.\n'),
'A/B/F/xE/beta' : Item('This is the file \'beta\'.\n'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.remove('A/B/E/alpha')
expected_status.add({
'A/B/F/xE' : Item(status=' ', wc_rev='1', prev_status='X '),
'A/B/F/xE/alpha' : Item(status=' ', wc_rev='1'),
'A/B/F/xE/beta' : Item(status=' ', wc_rev='1'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status)
sbox.simple_propset('svn:externals', '^/A/B/E@2 xE', 'A/B/F')
sbox.simple_commit()
expected_output = svntest.wc.State(wc_dir, {
'A/B/F/xE/alpha' : Item(status='D '),
})
expected_disk.remove('A/B/F/xE/alpha')
expected_status.remove('A/B/F/xE/alpha')
expected_status.tweak(wc_rev=4)
expected_status.tweak('A/B/F/xE', 'A/B/F/xE/beta', wc_rev=2)
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
expected_status)
# XFAIL: EXTERNALS.def_revision and EXTERNALS.def_operational_revision
# are still r1 for 'A/B/F/xE' so status is not against the expected r2.
# No testsuite support for ood marker so examine status output manually.
expected_output = [
"X %s\n" % sbox.ospath('A/B/F/xE'),
"Status against revision: 4\n",
"\n",
"Performing status on external item at '%s':\n" % sbox.ospath('A/B/F/xE'),
"Status against revision: 2\n",
]
svntest.actions.run_and_verify_svn(expected_output, [],
'status', '-u', sbox.wc_dir)
def update_deletes_file_external(sbox):
"update deletes a file external"
sbox.build()
wc_dir = sbox.wc_dir
sbox.simple_propset('svn:externals', '../D/gamma gamma', 'A/C')
sbox.simple_commit()
sbox.simple_update()
# Create a branch
svntest.actions.run_and_verify_svn(None, [],
'copy',
'-m', 'create branch',
sbox.repo_url + '/A',
sbox.repo_url + '/A_copy')
# Update the working copy
sbox.simple_update()
# Remove the branch
svntest.actions.run_and_verify_svn(None, [],
'rm',
'-m', 'remove branch',
sbox.repo_url + '/A_copy')
# As of r1448345, this update fails:
# E000002: Can't remove directory '.../A_copy/C': No such file or directory
sbox.simple_update()
@Issue(4519)
def switch_relative_externals(sbox):
"switch relative externals"
sbox.build(create_wc=False)
svntest.actions.run_and_verify_svnmucc(None, [],
'-U', sbox.repo_url, '-m', 'Q',
'mkdir', 'branches',
'cp', '1', 'A', 'trunk',
'cp', '1', 'A', 'branches/A',
'propset', 'svn:externals',
'../C dirExC\n ../mu fileExMu',
'trunk/B',
'propset', 'svn:externals',
'../C dirExC\n ../mu fileExMu',
'branches/A/B')
wc = sbox.add_wc_path('wc')
svntest.actions.run_and_verify_svn(None, [],
'co', sbox.repo_url + '/trunk', wc)
# This forgets to update some externals data
svntest.actions.run_and_verify_svn(None, [],
'switch', sbox.repo_url + '/branches/A', wc)
# This upgrade makes the following update fail
svntest.actions.run_and_verify_svn(None, [],
'upgrade', wc)
svntest.actions.run_and_verify_svn(None, [],
'up', wc)
def copy_file_external_to_repo(sbox):
"explicitly copy file external to repo"
sbox.build()
wc_dir = sbox.wc_dir
change_external(sbox.ospath('A'), '^/A/mu ext')
sbox.simple_update()
svntest.actions.run_and_verify_svn(None, [], 'cp',
'--message', 'external copy',
sbox.ospath('A/ext'),
sbox.repo_url + '/ext_copy')
expected_output = svntest.wc.State(wc_dir, {
'ext_copy' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'A/ext' : Item('This is the file \'mu\'.\n'),
'ext_copy' : Item('This is the file \'mu\'.\n'),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, expected_disk, None)
@Issue(4550)
def replace_tree_with_foreign_external(sbox):
"replace tree with foreign external"
sbox.build()
wc_dir = sbox.wc_dir
repo_dir = sbox.repo_dir
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
svntest.main.copy_repos(repo_dir, other_repo_dir, 1)
sbox.simple_propset('svn:externals', other_repo_url + '/A/B X', 'A')
sbox.simple_commit()
sbox.simple_propdel('svn:externals', 'A')
sbox.simple_mkdir('A/X')
sbox.simple_mkdir('A/X/E')
sbox.simple_commit()
sbox.simple_update()
expected_output = svntest.wc.State(wc_dir, {
'A/X' : Item(status='D '),
'A' : Item(status=' U'),
'A/X/lambda' : Item(status='A '),
'A/X/E' : Item(status='A '),
'A/X/E/alpha' : Item(status='A '),
'A/X/E/beta' : Item(status='A '),
'A/X/F' : Item(status='A '),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/X' : Item(status=' ', wc_rev=1, prev_status='X '),
'A/X/E' : Item(status=' ', wc_rev=1, prev_status=' '),
'A/X/E/alpha' : Item(status=' ', wc_rev=1),
'A/X/E/beta' : Item(status=' ', wc_rev=1),
'A/X/F' : Item(status=' ', wc_rev=1),
'A/X/lambda' : Item(status=' ', wc_rev=1),
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, expected_status,
[], True,
'-r', '2', wc_dir)
def verify_pinned_externals(sbox, external_url_for, base_path_or_url,
external_youngest_rev, other_external_youngest_rev):
"helper for pin-externals tests"
expected_output = [
'%s@%d gamma\n' % (external_url_for["A/B/gamma"],
external_youngest_rev),
'\n',
]
if svntest.sandbox.is_url(base_path_or_url):
target = base_path_or_url + '/A_copy/B'
else:
target = sbox.ospath('A_copy/B')
svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:externals',
target)
expected_output = [
'exdir_G -r%d %s\n' % (other_external_youngest_rev,
external_url_for["A/C/exdir_G"]),
'%s exdir_H\n' % external_url_for["A/C/exdir_H"],
'\n',
]
if svntest.sandbox.is_url(base_path_or_url):
target = base_path_or_url + '/A_copy/C'
else:
target = sbox.ospath('A_copy/C')
svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:externals',
target)
expected_output = [
'%s@%d exdir_A\n' % (external_url_for["A/D/exdir_A"],
other_external_youngest_rev),
'%s@%d exdir_A/G\n' % (external_url_for["A/D/exdir_A/G/"],
other_external_youngest_rev),
'exdir_A/H -r1 %s\n' % external_url_for["A/D/exdir_A/H"],
'%s@%d x/y/z/blah\n' % (external_url_for["A/D/x/y/z/blah"],
other_external_youngest_rev),
'\n',
]
if svntest.sandbox.is_url(base_path_or_url):
target = base_path_or_url + '/A_copy/D'
else:
target = sbox.ospath('A_copy/D')
svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:externals',
target)
def copy_pin_externals_repos_repos(sbox):
"svn copy --pin-externals repos->repos"
external_url_for = externals_test_setup(sbox)
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_dir = repo_dir + ".other"
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
# Perform a repos->repos copy, pinning externals
svntest.actions.run_and_verify_svn(None, [],
'copy',
repo_url + '/A',
repo_url + '/A_copy',
'-m', 'copy',
'--pin-externals')
verify_pinned_externals(sbox, external_url_for, repo_url,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_repos_wc(sbox):
"svn copy --pin-externals repos->wc"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_dir = repo_dir + ".other"
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Perform a repos->wc copy, pinning externals
external_youngest_rev = svntest.main.youngest(repo_dir)
svntest.actions.run_and_verify_svn(None, [],
'copy',
repo_url + '/A',
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
verify_pinned_externals(sbox, external_url_for, wc_dir,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_wc_repos(sbox):
"svn copy --pin-externals wc->repos"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_dir = repo_dir + ".other"
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Perform a wc->repos copy, pinning externals
svntest.actions.run_and_verify_svn(None, [],
'copy',
os.path.join(wc_dir, 'A'),
repo_url + '/A_copy',
'-m', 'copy',
'--pin-externals')
verify_pinned_externals(sbox, external_url_for, repo_url,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_wc_wc(sbox):
"svn copy --pin-externals wc->wc"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_dir = repo_dir + ".other"
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Perform a wc->wc copy, pinning externals
svntest.actions.run_and_verify_svn(None, [],
'copy',
os.path.join(wc_dir, 'A'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
verify_pinned_externals(sbox, external_url_for, wc_dir,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_moved_external(sbox):
"pin externals which were moved since last changed"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_dir = repo_dir + ".other"
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Test behaviour for external URLs which were moved since
# their last-changed revision.
sbox.simple_move('A/D/gamma', 'A/D/gamma-moved')
sbox.simple_commit()
change_external(sbox.ospath('A/B'), '^/A/D/gamma-moved gamma', commit=True)
sbox.simple_update()
external_youngest_rev = svntest.main.youngest(repo_dir)
svntest.actions.run_and_verify_svn(None, [],
'copy',
os.path.join(wc_dir, 'A'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
external_url_for["A/B/gamma"] = '^/A/D/gamma-moved'
verify_pinned_externals(sbox, external_url_for, wc_dir,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_removed_in_head(sbox):
"already pinned external which was removed in HEAD"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_url = repo_url + ".other"
other_repo_dir = repo_dir + ".other"
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Test an already pinned external which was removed in HEAD.
svntest.actions.run_and_verify_svn(None, [],
'rm',
other_repo_url + '/A/D/H',
'-m', 'remove A/D/H')
sbox.simple_update()
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
svntest.actions.run_and_verify_svn(None, [],
'copy',
os.path.join(wc_dir, 'A'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
verify_pinned_externals(sbox, external_url_for, wc_dir,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_from_old_rev(sbox):
"copy from an old revision with pinning"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
repo_dir = sbox.repo_dir
other_repo_url = repo_url + ".other"
other_repo_dir = repo_dir + ".other"
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Create a couple of revisions affecting 'A'.
for i in range(5):
svntest.main.file_append(sbox.ospath('A/mu'), 'a new line')
sbox.simple_commit()
sbox.simple_update()
# Test a copy from an old revision with pinning.
external_youngest_rev = svntest.main.youngest(repo_dir)
other_external_youngest_rev = svntest.main.youngest(other_repo_dir)
svntest.actions.run_and_verify_svn(None, [],
'copy',
os.path.join(wc_dir, 'A@6'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
external_url_for["A/B/gamma"] = '^/A/D/gamma'
verify_pinned_externals(sbox, external_url_for, wc_dir,
external_youngest_rev, other_external_youngest_rev)
def copy_pin_externals_wc_local_mods(sbox):
"cannot pin WC externals with local mods"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.main.file_append(sbox.ospath('A/C/exdir_G/pi'), 'this file changed')
expected_stderr = verify.RegexOutput(".*Cannot pin.*local modifications.*",
match_all=False)
svntest.actions.run_and_verify_svn(None, expected_stderr,
'copy',
os.path.join(wc_dir, 'A'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
def copy_pin_externals_wc_switched_subtrees(sbox):
"cannot pin WC externals with switched subtrees"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'switch', '--ignore-ancestry', '^/A/B',
sbox.ospath('A/D/exdir_A/C'))
expected_stderr = verify.RegexOutput(".*Cannot pin.*switched subtree.*",
match_all=False)
svntest.actions.run_and_verify_svn(None, expected_stderr,
'copy',
os.path.join(wc_dir, 'A'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
def copy_pin_externals_wc_mixed_revisions(sbox):
"cannot pin WC externals with mixed revisions"
external_url_for = externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
# Create a working copy.
svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
svntest.actions.run_and_verify_svn(None, [],
'update', '-r1',
sbox.ospath('A/D/exdir_A/mu'))
expected_stderr = verify.RegexOutput(".*Cannot pin.*mixed-revision.*",
match_all=False)
svntest.actions.run_and_verify_svn(None, expected_stderr,
'copy',
os.path.join(wc_dir, 'A'),
os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
@Issue(4558)
def copy_pin_externals_whitespace_dir(sbox):
"copy --pin-externals with whitespace dir"
sbox.build(empty=True)
repo_url = sbox.repo_url
wc_dir = sbox.wc_dir
ss_path = repo_url[repo_url.find('//'):]
extdef = sbox.get_tempname('extdef')
info = sbox.get_tempname('info')
open(extdef, 'w').write(
'"' + ss_path +'/deps/sqlite" ext/sqlite\n' +
'"^/deps/A P R" \'ext/A P R\'\n' +
'^/deps/B\ D\ B\' ext/B\ D\ B\'\n' +
repo_url + '/deps/wors%23+t ext/wors#+t')
open(info, 'w').write('info\n')
svntest.actions.run_and_verify_svnmucc(None, [], '-U', repo_url,
'mkdir', 'trunk',
'mkdir', 'branches',
'mkdir', 'deps',
'mkdir', 'deps/sqlite',
'put', info, 'deps/sqlite/readme',
'mkdir', 'deps/A P R',
'put', info, 'deps/A P R/about',
'mkdir', 'deps/B D B\'',
'put', info, 'deps/B D B\'/copying',
'mkdir', 'deps/wors#+t',
'put', info, 'deps/wors#+t/brood',
'propsetf', 'svn:externals', extdef,
'trunk',
'-mm'
)
svntest.actions.run_and_verify_svn(None, [], 'update', sbox.ospath('trunk'),
'--ignore-externals')
sbox.simple_update('branches')
expected_status = svntest.wc.State(wc_dir, {
'' : Item(status=' ', wc_rev='0'),
'trunk' : Item(status=' ', wc_rev='1'),
'branches' : Item(status=' ', wc_rev='1'),
})
svntest.actions.run_and_verify_status(wc_dir, expected_status)
trunk_url = repo_url + '/trunk'
branches_url = repo_url + '/branches'
trunk_wc = sbox.ospath('trunk')
# Create a new revision to creat interesting pinning revisions
sbox.simple_propset('A', 'B', 'trunk')
sbox.simple_commit('trunk')
# And let's copy/pin
svntest.actions.run_and_verify_svn(None, [],
'copy', '--pin-externals',
trunk_url, branches_url + '/url-url', '-mm')
svntest.actions.run_and_verify_svn(None, [],
'copy', '--pin-externals',
trunk_url, sbox.ospath('branches/url-wc'))
sbox.simple_commit('branches/url-wc')
# Now try to copy without externals in the WC
expected_err = '.*E155035: Cannot pin external.*'
svntest.actions.run_and_verify_svn(None, expected_err,
'copy', '--pin-externals',
trunk_wc, branches_url + '/wc-url', '-mm')
svntest.actions.run_and_verify_svn(None, expected_err,
'copy', '--pin-externals',
trunk_wc, sbox.ospath('branches/wc-wc'))
# Bring in the externals on trunk
svntest.actions.run_and_verify_svn(None, [], 'update', sbox.ospath('trunk'))
expected_status = svntest.wc.State(wc_dir, {
'trunk' : Item(status=' ', wc_rev='4'),
'trunk/ext' : Item(status='X '),
'trunk/ext/sqlite' : Item(status=' ', wc_rev='4'),
'trunk/ext/sqlite/readme' : Item(status=' ', wc_rev='4'),
'trunk/ext/A P R' : Item(status=' ', wc_rev='4'),
'trunk/ext/A P R/about' : Item(status=' ', wc_rev='4'),
'trunk/ext/B D B\'' : Item(status=' ', wc_rev='4'),
'trunk/ext/B D B\'/copying' : Item(status=' ', wc_rev='4'),
'trunk/ext/wors#+t' : Item(status=' ', wc_rev='4'),
'trunk/ext/wors#+t/brood' : Item(status=' ', wc_rev='4'),
})
svntest.actions.run_and_verify_status(sbox.ospath('trunk'), expected_status)
# And copy again
svntest.actions.run_and_verify_svn(None, [],
'copy', '--pin-externals',
trunk_wc, branches_url + '/wc-url', '-mm')
svntest.actions.run_and_verify_svn(None, [],
'copy', '--pin-externals',
trunk_wc, sbox.ospath('branches/wc-wc'))
sbox.simple_commit('branches/wc-wc')
expected_output = svntest.wc.State(wc_dir, {
'branches/url-url' : Item(status='A '),
'branches/url-url/ext/A P R/about' : Item(status='A '),
'branches/url-url/ext/B D B\'/copying' : Item(status='A '),
'branches/url-url/ext/wors#+t/brood' : Item(status='A '),
'branches/url-url/ext/sqlite/readme' : Item(status='A '),
# url-wc is already up to date
'branches/wc-url' : Item(status='A '),
'branches/wc-url/ext/wors#+t/brood' : Item(status='A '),
'branches/wc-url/ext/sqlite/readme' : Item(status='A '),
'branches/wc-url/ext/B D B\'/copying' : Item(status='A '),
'branches/wc-url/ext/A P R/about' : Item(status='A '),
## branches/wc-wc should checkout its externals here
})
expected_status = svntest.wc.State(wc_dir, {
'branches' : Item(status=' ', wc_rev='6'),
'branches/url-url' : Item(status=' ', wc_rev='6'),
'branches/url-url/ext' : Item(status='X '),
'branches/url-url/ext/A P R' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/A P R/about' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/sqlite' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/sqlite/readme' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/wors#+t' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/wors#+t/brood' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/B D B\'' : Item(status=' ', wc_rev='2'),
'branches/url-url/ext/B D B\'/copying' : Item(status=' ', wc_rev='2'),
'branches/url-wc' : Item(status=' ', wc_rev='6'),
'branches/url-wc/ext' : Item(status='X '),
'branches/url-wc/ext/wors#+t' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/wors#+t/brood' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/B D B\'' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/B D B\'/copying' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/sqlite' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/sqlite/readme' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/A P R' : Item(status=' ', wc_rev='3'),
'branches/url-wc/ext/A P R/about' : Item(status=' ', wc_rev='3'),
'branches/wc-url' : Item(status=' ', wc_rev='6'),
'branches/wc-url/ext' : Item(status='X '),
'branches/wc-url/ext/wors#+t' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/wors#+t/brood' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/sqlite' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/sqlite/readme' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/B D B\'' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/B D B\'/copying' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/A P R' : Item(status=' ', wc_rev='4'),
'branches/wc-url/ext/A P R/about' : Item(status=' ', wc_rev='4'),
'branches/wc-wc' : Item(status=' ', wc_rev='6'),
'branches/wc-wc/ext' : Item(status='X '),
'branches/wc-wc/ext/wors#+t' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/wors#+t/brood' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/sqlite' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/sqlite/readme' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/B D B\'' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/B D B\'/copying' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/A P R' : Item(status=' ', wc_rev='4'),
'branches/wc-wc/ext/A P R/about' : Item(status=' ', wc_rev='4'),
})
svntest.actions.run_and_verify_update(wc_dir + '/branches', expected_output,
None, expected_status)
# Now let's use our existing setup to perform some copies with dynamic
# destinations
svntest.actions.run_and_verify_svn(None, [],
'copy', '--parents', '--pin-externals',
repo_url + '/branches/wc-url',
repo_url + '/branches/url-url',
trunk_url,
branches_url + '/3x-url-url',
'-mm')
svntest.actions.run_and_verify_svn(None, [],
'copy', '--parents', '--pin-externals',
repo_url + '/branches/wc-url',
repo_url + '/branches/url-url',
trunk_url,
sbox.ospath('branches/3x-url-wc'))
svntest.actions.run_and_verify_svn(None, [],
'copy', '--parents', '--pin-externals',
sbox.ospath('branches/wc-url'),
sbox.ospath('branches/url-url'),
sbox.ospath('trunk'),
branches_url + '/3x-wc-url',
'-mm')
svntest.actions.run_and_verify_svn(None, [],
'copy', '--parents', '--pin-externals',
sbox.ospath('branches/wc-url'),
sbox.ospath('branches/url-url'),
sbox.ospath('trunk'),
sbox.ospath('branches/3x-wc-wc'))
def nested_notification(sbox):
"notification for nested externals"
sbox.build()
wc_dir = sbox.wc_dir
repo_dir = sbox.repo_dir
sbox.simple_mkdir('D1')
sbox.simple_mkdir('D2')
sbox.simple_mkdir('D3')
sbox.simple_mkdir('D4')
sbox.simple_propset('svn:externals', '^/D2 X', 'D1')
sbox.simple_propset('svn:externals', '^/D3 X', 'D2')
sbox.simple_propset('svn:externals', '^/D4 X', 'D3')
sbox.simple_commit()
expected_output = [
'Updating \'' + sbox.ospath('D1') + '\':\n',
'\n',
'Fetching external item into \'' + sbox.ospath('D1/X') + '\':\n',
' U ' + sbox.ospath('D1/X') + '\n',
'\n',
'Fetching external item into \'' + sbox.ospath('D1/X/X') + '\':\n',
' U ' + sbox.ospath('D1/X/X') + '\n',
'\n',
'Fetching external item into \'' + sbox.ospath('D1/X/X/X') + '\':\n',
'Updated external to revision 2.\n',
'\n',
'External at revision 2.\n',
'\n',
'External at revision 2.\n',
'\n',
'At revision 2.\n'
]
svntest.actions.run_and_verify_svn(expected_output, [],
'update', sbox.ospath('D1'))
def file_external_to_normal_file(sbox):
"change a file external to a normal file"
sbox.build()
wc_dir = sbox.wc_dir
sbox.simple_propset('svn:externals', '^/iota iota', 'A')
sbox.simple_commit()
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'A/iota' : Item(status=' ', wc_rev='2', switched='X'),
})
expected_output = svntest.wc.State(wc_dir, {
'A/iota' : Item(status='A '),
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status)
# Create second working copy in this state
sbox2 = sbox.clone_dependent(copy_wc=True)
sbox.simple_propdel('svn:externals', 'A')
expected_output = svntest.wc.State(wc_dir, {
'A/iota' : Item(verb='Removed external'),
})
expected_status.remove('A/iota')
expected_status.tweak('A', status=' M')
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status)
sbox.simple_copy('iota', 'A/iota')
sbox.simple_commit()
expected_output = svntest.wc.State(wc_dir, {
})
expected_status.tweak(wc_rev=3)
expected_status.tweak('A', status=' ')
expected_status.add({
# This case used to triggered a switched status in 1.8.x before this
# test (and the fix for this problem) where added.
'A/iota' : Item(status=' ', wc_rev='3'),
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status)
wc_dir = sbox2.wc_dir
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_output = svntest.wc.State(wc_dir, {
'A' : Item(status=' U'),
'A/iota' : Item(verb='Removed external', prev_verb='Skipped'),
})
# This reports an obstruction and removes the file external
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status)
expected_status.add({
'A/iota' : Item(status=' ', wc_rev='3'),
})
expected_output = svntest.wc.State(wc_dir, {
'A/iota' : Item(status='A '),
})
# This should bring in the new file
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status)
@Issue(4580)
def file_external_recorded_info(sbox):
"check file external recorded info"
sbox.build()
wc_dir = sbox.wc_dir
# r2 - Create file external
svntest.actions.run_and_verify_svnmucc(None, [],
'-U', sbox.repo_url,
'-m', '',
'propset', 'svn:externals',
'^/iota i', '')
expected_output = svntest.wc.State(wc_dir, {
'' : Item(status=' U'),
'i' : Item(status='A '),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'i' : Item(status=' ', wc_rev='2', switched='X')
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status, [], False,
'-r', 2, wc_dir)
expected_infos = [{
'Path': re.escape(sbox.ospath('i')),
'Relative URL': re.escape('^/iota'),
'Revision': '2',
'Last Changed Rev': '1',
'Last Changed Author': 'jrandom'
}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('i'))
# r3 - No-op change
svntest.actions.run_and_verify_svnmucc(None, [],
'-U', sbox.repo_url,
'-m', '',
'cp', '1', 'iota', 'iotb')
expected_output = svntest.wc.State(wc_dir, {
'iotb' : Item(status='A '),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
expected_status.add({
'i' : Item(status=' ', wc_rev='3', switched='X'),
'iotb' : Item(status=' ', wc_rev='3')
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status, [], False,
'-r', 3, wc_dir)
expected_infos = [{
'Path': re.escape(sbox.ospath('i')),
'Relative URL': re.escape('^/iota'),
'Revision': '3',
'Last Changed Rev': '1',
'Last Changed Author': 'jrandom'
}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('i'))
# r4 - Update url
svntest.actions.run_and_verify_svnmucc(None, [],
'-U', sbox.repo_url,
'-m', '',
'propset', 'svn:externals',
'^/iotb i', '')
expected_output = svntest.wc.State(wc_dir, {
'' : Item(status=' U'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 4)
expected_status.add({
'i' : Item(status=' ', wc_rev='4', switched='X'),
'iotb' : Item(status=' ', wc_rev='4')
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status, [], False,
'-r', 4, wc_dir)
expected_infos = [{
'Path': re.escape(sbox.ospath('i')),
'Relative URL': re.escape('^/iotb'),
'Revision': '4',
'Last Changed Rev': '3',
'Last Changed Author': 'jrandom'
}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('i'))
# r5 - Replace file
svntest.actions.run_and_verify_svnmucc(None, [],
'-U', sbox.repo_url,
'-m', '',
'rm', 'iotb',
'cp', '3', 'A/mu', 'iotb')
expected_output = svntest.wc.State(wc_dir, {
'i' : Item(status='U '),
'iotb' : Item(status='A ', prev_status='D '),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 5)
expected_status.add({
'i' : Item(status=' ', wc_rev='5', switched='X'),
'iotb' : Item(status=' ', wc_rev='5')
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status, [], False,
'-r', 5, wc_dir)
expected_infos = [{
'Path': re.escape(sbox.ospath('i')),
'Relative URL': re.escape('^/iotb'),
'Revision': '5',
'Last Changed Rev': '5',
'Last Changed Author': 'jrandom'
}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('i'))
# Back to r2. But with a conflict
sbox.simple_append('i', 'i')
expected_output = svntest.wc.State(wc_dir, {
'' : Item(status=' U'),
'iotb' : Item(status='D '),
'i' : Item(status='C '),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.add({
'i' : Item(status='C ', wc_rev='5', switched='X'),
})
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status, [], False,
'-r', 2, wc_dir)
expected_infos = [{
'Path': re.escape(sbox.ospath('i')),
'Relative URL': re.escape('^/iota'),
'Revision': '5',
'Last Changed Rev': '1',
'Last Changed Author': 'jrandom',
'Conflict Details': re.escape('incoming file edit upon switch'
' Source left: (file) ^/iotb@5'
' Source right: (file) ^/iota@5')
}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('i'))
def external_externally_removed(sbox):
"external externally removed"
sbox.build(read_only = True)
sbox.simple_propset('svn:externals', '^/A/B B', '')
# Try fetching the external with a versioned obstruction
sbox.simple_mkdir('B')
expected_err = ".*W155035: The external.*B' is already a versioned path"
svntest.actions.run_and_verify_svn(None, expected_err,
'up', sbox.wc_dir)
sbox.simple_rm('B')
os.makedirs(sbox.ospath('B'))
expected_err2 = "svn: warning: W155007:.*B'"
svntest.actions.run_and_verify_svn(None, expected_err2,
'up', sbox.wc_dir)
os.rmdir(sbox.ospath('B'))
# Fetch the external
sbox.simple_update()
svntest.main.safe_rmtree(sbox.ospath('B'))
sbox.simple_update() # Fetched again
if not os.path.isdir(sbox.ospath('B')):
raise svntest.Failure("B not recreated")
svntest.main.safe_rmtree(sbox.ospath('B'))
sbox.simple_propdel('svn:externals', '')
expected_output = [
"Updating '%s':\n" % sbox.wc_dir,
"Removed external '%s'\n" % sbox.ospath('B'),
"Updated to revision 1.\n"
]
svntest.actions.run_and_verify_svn(expected_output, [],
'up', sbox.wc_dir)
sbox.simple_propset('svn:externals', '^/A/B B', '')
sbox.simple_update()
svntest.main.safe_rmtree(sbox.ospath('B'))
sbox.simple_mkdir('B')
svntest.actions.run_and_verify_svn(None, expected_err,
'up', sbox.wc_dir)
sbox.simple_propdel('svn:externals', '')
sbox.simple_update() # Should succeed
########################################################################
# Run the tests
# list all tests here, starting with None:
test_list = [ None,
checkout_with_externals,
update_receive_new_external,
update_lose_external,
update_change_pristine_external,
update_change_modified_external,
update_receive_change_under_external,
modify_and_update_receive_new_external,
disallow_dot_or_dotdot_directory_reference,
export_with_externals,
export_wc_with_externals,
external_with_peg_and_op_revision,
new_style_externals,
disallow_propset_invalid_formatted_externals,
old_style_externals_ignore_peg_reg,
cannot_move_or_remove_file_externals,
cant_place_file_external_into_dir_external,
external_into_path_with_spaces,
binary_file_externals,
update_lose_file_external,
switch_relative_external,
export_sparse_wc_with_externals,
relegate_external,
wc_repos_file_externals,
merge_target_with_externals,
update_modify_file_external,
update_external_on_locally_added_dir,
switch_external_on_locally_added_dir,
file_external_in_sibling,
file_external_update_without_commit,
incoming_file_on_file_external,
incoming_file_external_on_file,
exclude_externals,
file_externals_different_url,
file_external_in_unversioned,
copy_file_externals,
commit_include_externals,
include_immediate_dir_externals,
shadowing,
remap_file_external_with_prop_del,
dir_external_with_dash_r_only,
url_to_wc_copy_of_externals,
duplicate_targets,
list_include_externals,
move_with_file_externals,
pinned_externals,
update_dir_external_shallow,
switch_parent_relative_file_external,
file_external_unversioned_obstruction,
file_external_versioned_obstruction,
update_external_peg_rev,
update_deletes_file_external,
switch_relative_externals,
copy_file_external_to_repo,
replace_tree_with_foreign_external,
copy_pin_externals_repos_repos,
copy_pin_externals_repos_wc,
copy_pin_externals_wc_repos,
copy_pin_externals_wc_wc,
copy_pin_externals_moved_external,
copy_pin_externals_removed_in_head,
copy_pin_externals_from_old_rev,
copy_pin_externals_wc_local_mods,
copy_pin_externals_wc_switched_subtrees,
copy_pin_externals_wc_mixed_revisions,
copy_pin_externals_whitespace_dir,
nested_notification,
file_external_to_normal_file,
file_external_recorded_info,
external_externally_removed,
]
if __name__ == '__main__':
svntest.main.run_tests(test_list)
# NOTREACHED
### End of file.