def pull(repo, source, heads=[], force=False, meta=None):
"""pull new revisions from Subversion"""
assert source.capable('subversion')
svn_url = source.svnurl
# Split off #rev
svn_url, heads, checkout = util.parseurl(svn_url, heads)
old_encoding = util.swap_out_encoding()
total = None
try:
have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
if not have_replay:
repo.ui.note('fetching stupidly...\n')
svn = source.svn
if meta is None:
meta = repo.svnmeta(svn.uuid, svn.subdir)
stopat_rev = util.parse_revnum(svn, checkout)
if meta.layout == 'auto':
meta.layout = meta.layout_from_subversion(svn, (stopat_rev or None))
repo.ui.note('using %s layout\n' % meta.layout)
if meta.branch:
if meta.layout != 'single':
msg = ('branch cannot be specified for Subversion clones using '
'standard directory layout')
raise hgerror.Abort(msg)
meta.branchmap['default'] = meta.branch
ui = repo.ui
start = meta.revmap.lastpulled
if start <= 0:
# we are initializing a new repository
start = util.parse_revnum(svn, repo.ui.config('hgsubversion',
'startrev', 0))
if start > 0:
if meta.layout == 'standard':
raise hgerror.Abort('non-zero start revisions are only '
'supported for single-directory clones.')
ui.note('starting at revision %d; any prior will be ignored\n'
% start)
# fetch all revisions *including* the one specified...
start -= 1
# anything less than zero makes no sense
if start < 0:
start = 0
skiprevs = repo.ui.configlist('hgsubversion', 'unsafeskip', '')
skiprevs = set(util.parse_revnum(svn, r) for r in skiprevs)
oldrevisions = len(meta.revmap)
if stopat_rev:
total = stopat_rev - start
else:
total = svn.HEAD - start
lastpulled = None
lock = meta.repo.lock()
try:
# start converting revisions
firstrun = True
for r in svn.revisions(start=start, stop=stopat_rev):
if (r.revnum in skiprevs or
(r.author is None and
r.message == 'This is an empty revision for padding.')):
lastpulled = r.revnum
continue
tbdelta = meta.update_branch_tag_map_for_rev(r)
# got a 502? Try more than once!
tries = 0
converted = False
while not converted:
try:
msg = meta.getmessage(r).strip()
if msg:
msg = [s.strip() for s in msg.splitlines() if s][0]
if getattr(ui, 'termwidth', False):
w = ui.termwidth()
else:
w = hgutil.termwidth()
bits = (r.revnum, r.author, msg)
ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
compathacks.progress(ui, 'pull', r.revnum - start,
total=total)
meta.save_tbdelta(tbdelta)
close = pullfuns[have_replay](ui, meta, svn, r, tbdelta,
firstrun)
meta.committags(r, close)
for branch, parent in close.iteritems():
if parent in (None, node.nullid):
continue
meta.delbranch(branch, parent, r)
meta.save()
converted = True
firstrun = False
except svnwrap.SubversionRepoCanNotReplay, e: # pragma: no cover
ui.status('%s\n' % e.message)
stupidmod.print_your_svn_is_old_message(ui)
have_replay = False
except svnwrap.SubversionException, e: # pragma: no cover
if (e.args[1] == svnwrap.ERR_RA_DAV_REQUEST_FAILED
and '502' in str(e)
and tries < 3):
tries += 1
ui.status('Got a 502, retrying (%s)\n' % tries)
else:
ui.traceback()
raise hgerror.Abort(*e.args)
def pull(repo, source, heads=[], force=False):
"""pull new revisions from Subversion"""
assert source.capable('subversion')
svn_url = source.svnurl
# Split off #rev
svn_url, heads, checkout = util.parseurl(svn_url, heads)
old_encoding = util.swap_out_encoding()
try:
stopat_rev = int(checkout or 0)
except ValueError:
raise hgutil.Abort('unrecognised Subversion revision %s: '
'only numbers work.' % checkout)
have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
if not have_replay:
repo.ui.note('fetching stupidly...\n')
svn = source.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
layout = repo.ui.config('hgsubversion', 'layout', 'auto')
if layout == 'auto':
rootlist = svn.list_dir('', revision=(stopat_rev or None))
if sum(map(lambda x: x in rootlist, ('branches', 'tags', 'trunk'))):
layout = 'standard'
else:
layout = 'single'
repo.ui.setconfig('hgsubversion', 'layout', layout)
repo.ui.note('using %s layout\n' % layout)
branch = repo.ui.config('hgsubversion', 'branch')
if branch:
if layout != 'single':
msg = ('branch cannot be specified for Subversion clones using '
'standard directory layout')
raise hgutil.Abort(msg)
meta.branchmap['default'] = branch
ui = repo.ui
start = meta.revmap.youngest
origrevcount = len(meta.revmap)
if start <= 0:
# we are initializing a new repository
start = repo.ui.config('hgsubversion', 'startrev', 0)
if isinstance(start, str) and start.upper() == 'HEAD':
start = svn.last_changed_rev
else:
start = int(start)
if start > 0:
if layout == 'standard':
raise hgutil.Abort('non-zero start revisions are only '
'supported for single-directory clones.')
ui.note('starting at revision %d; any prior will be ignored\n'
% start)
# fetch all revisions *including* the one specified...
start -= 1
# anything less than zero makes no sense
if start < 0:
start = 0
oldrevisions = len(meta.revmap)
if stopat_rev:
total = stopat_rev - start
else:
total = svn.HEAD - start
try:
try:
# start converting revisions
firstrun = True
for r in svn.revisions(start=start, stop=stopat_rev):
if (r.author is None and
r.message == 'This is an empty revision for padding.'):
continue
tbdelta = meta.update_branch_tag_map_for_rev(r)
# got a 502? Try more than once!
tries = 0
converted = False
while not converted:
try:
msg = ''
if r.message:
msg = r.message.strip()
if not msg:
msg = util.default_commit_msg(ui)
else:
msg = [s.strip() for s in msg.splitlines() if s][0]
if getattr(ui, 'termwidth', False):
w = ui.termwidth()
else:
w = hgutil.termwidth()
bits = (r.revnum, r.author, msg)
ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
util.progress(ui, 'pull', r.revnum - start, total=total)
meta.save_tbdelta(tbdelta)
close = pullfuns[have_replay](ui, meta, svn, r, tbdelta,
firstrun)
meta.committags(r, close)
for branch, parent in close.iteritems():
if parent in (None, node.nullid):
continue
meta.delbranch(branch, parent, r)
meta.save()
converted = True
firstrun = False
except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
ui.status('%s\n' % e.message)
stupidmod.print_your_svn_is_old_message(ui)
have_replay = False
except svnwrap.SubversionException, e: #pragma: no cover
if (e.args[1] == svnwrap.ERR_RA_DAV_REQUEST_FAILED
and '502' in str(e)
and tries < 3):
tries += 1
ui.status('Got a 502, retrying (%s)\n' % tries)
else:
ui.traceback()
raise hgutil.Abort(*e.args)
def pull(repo, source, heads=[], force=False):
"""pull new revisions from Subversion"""
assert source.capable('subversion')
svn_url = source.svnurl
# Split off #rev
svn_url, heads, checkout = util.parseurl(svn_url, heads)
old_encoding = util.swap_out_encoding()
# TODO implement skipto support
skipto_rev = 0
try:
stopat_rev = int(checkout or 0)
except ValueError:
raise hgutil.Abort('unrecognised Subversion revision %s: '
'only numbers work.' % checkout)
have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
if have_replay and not callable(
delta.svn_txdelta_apply(None, None, None)[0]): #pragma: no cover
repo.ui.status('You are using old Subversion SWIG bindings. Replay '
'will not work until you upgrade to 1.5.0 or newer. '
'Falling back to a slower method that may be buggier. '
'Please upgrade, or contribute a patch to use the '
'ctypes bindings instead of SWIG.\n')
have_replay = False
elif not have_replay:
repo.ui.note('fetching stupidly...\n')
# TODO: do credentials specified in the URL still work?
svn = svnrepo.svnremoterepo(repo.ui, svn_url).svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
layout = repo.ui.config('hgsubversion', 'layout', 'auto')
if layout == 'auto':
rootlist = svn.list_dir('', revision=(stopat_rev or None))
if sum(map(lambda x: x in rootlist, ('branches', 'tags', 'trunk'))):
layout = 'standard'
else:
layout = 'single'
repo.ui.setconfig('hgsubversion', 'layout', layout)
repo.ui.note('using %s layout\n' % layout)
start = max(meta.revmap.seen, skipto_rev)
initializing_repo = meta.revmap.seen <= 0
ui = repo.ui
if initializing_repo and start > 0:
raise hgutil.Abort('Revision skipping at repository initialization '
'remains unimplemented.')
oldrevisions = len(meta.revmap)
cnt = 0
if stopat_rev:
total = stopat_rev - start
else:
total = svn.HEAD - start
try:
try:
# start converting revisions
for r in svn.revisions(start=start, stop=stopat_rev):
if (r.author is None and
r.message == 'This is an empty revision for padding.'):
continue
tbdelta = meta.update_branch_tag_map_for_rev(r)
# got a 502? Try more than once!
tries = 0
converted = False
while not converted:
try:
msg = ''
if r.message:
msg = r.message.strip()
if not msg:
msg = util.default_commit_msg
else:
msg = [s.strip() for s in msg.splitlines() if s][0]
w = hgutil.termwidth()
bits = (r.revnum, r.author, msg)
cnt += 1
ui.status(('[r%d] %s: %s\n' % bits)[:w])
util.progress(ui, 'pull', cnt, total=total)
meta.save_tbdelta(tbdelta)
close = pullfuns[have_replay](ui, meta, svn, r, tbdelta)
meta.committags(r, close)
for branch, parent in close.iteritems():
if parent in (None, node.nullid):
continue
meta.delbranch(branch, parent, r)
meta.save()
converted = True
except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
ui.status('%s\n' % e.message)
stupidmod.print_your_svn_is_old_message(ui)
have_replay = False
except core.SubversionException, e: #pragma: no cover
if (e.apr_err == core.SVN_ERR_RA_DAV_REQUEST_FAILED
and '502' in str(e)
and tries < 3):
tries += 1
ui.status('Got a 502, retrying (%s)\n' % tries)
else:
raise hgutil.Abort(*e.args)
def pull(repo, source, heads=[], force=False):
"""pull new revisions from Subversion"""
assert source.capable('subversion')
svn_url = source.svnurl
# Split off #rev
svn_url, heads, checkout = util.parseurl(svn_url, heads)
old_encoding = util.swap_out_encoding()
try:
stopat_rev = int(checkout or 0)
except ValueError:
raise hgutil.Abort('unrecognised Subversion revision %s: '
'only numbers work.' % checkout)
have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
if not have_replay:
repo.ui.note('fetching stupidly...\n')
svn = source.svn
meta = repo.svnmeta(svn.uuid, svn.subdir)
layout = repo.ui.config('hgsubversion', 'layout', 'auto')
if layout == 'auto':
rootlist = svn.list_dir('', revision=(stopat_rev or None))
if sum(map(lambda x: x in rootlist, ('branches', 'tags', 'trunk'))):
layout = 'standard'
else:
layout = 'single'
repo.ui.setconfig('hgsubversion', 'layout', layout)
repo.ui.note('using %s layout\n' % layout)
branch = repo.ui.config('hgsubversion', 'branch')
if branch:
if layout != 'single':
msg = ('branch cannot be specified for Subversion clones using '
'standard directory layout')
raise hgutil.Abort(msg)
meta.branchmap['default'] = branch
ui = repo.ui
start = meta.revmap.youngest
origrevcount = len(meta.revmap)
if start <= 0:
# we are initializing a new repository
start = repo.ui.config('hgsubversion', 'startrev', 0)
if isinstance(start, str) and start.upper() == 'HEAD':
start = svn.last_changed_rev
else:
start = int(start)
if start > 0:
if layout == 'standard':
raise hgutil.Abort('non-zero start revisions are only '
'supported for single-directory clones.')
ui.note('starting at revision %d; any prior will be ignored\n' %
start)
# fetch all revisions *including* the one specified...
start -= 1
# anything less than zero makes no sense
if start < 0:
start = 0
oldrevisions = len(meta.revmap)
if stopat_rev:
total = stopat_rev - start
else:
total = svn.HEAD - start
try:
try:
# start converting revisions
firstrun = True
for r in svn.revisions(start=start, stop=stopat_rev):
if (r.author is None and r.message
== 'This is an empty revision for padding.'):
continue
tbdelta = meta.update_branch_tag_map_for_rev(r)
# got a 502? Try more than once!
tries = 0
converted = False
while not converted:
try:
msg = ''
if r.message:
msg = r.message.strip()
if not msg:
msg = util.default_commit_msg(ui)
else:
msg = [s.strip() for s in msg.splitlines() if s][0]
if getattr(ui, 'termwidth', False):
w = ui.termwidth()
else:
w = hgutil.termwidth()
bits = (r.revnum, r.author, msg)
ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
util.progress(ui,
'pull',
r.revnum - start,
total=total)
meta.save_tbdelta(tbdelta)
close = pullfuns[have_replay](ui, meta, svn, r,
tbdelta, firstrun)
meta.committags(r, close)
for branch, parent in close.iteritems():
if parent in (None, node.nullid):
continue
meta.delbranch(branch, parent, r)
meta.save()
converted = True
firstrun = False
except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
ui.status('%s\n' % e.message)
stupidmod.print_your_svn_is_old_message(ui)
have_replay = False
except svnwrap.SubversionException, e: #pragma: no cover
if (e.args[1] == svnwrap.ERR_RA_DAV_REQUEST_FAILED
and '502' in str(e) and tries < 3):
tries += 1
ui.status('Got a 502, retrying (%s)\n' % tries)
else:
ui.traceback()
raise hgutil.Abort(*e.args)
