def real_main(options, args):
if check_for_applied_patches():
print("There are applied mq patches. Put them aside before "
"running hgpullsvn.")
return 1
svn_wc = "."
# Get SVN info
svn_info = get_svn_info('.')
current_rev = svn_info['revision']
next_rev = current_rev + 1
# e.g. u'svn://svn.twistedmatrix.com/svn/Twisted'
repos_url = svn_info['repos_url']
# e.g. u'svn://svn.twistedmatrix.com/svn/Twisted/branches/xmpp-subprotocols-2178-2'
wc_url = svn_info['url']
assert wc_url.startswith(repos_url)
# e.g. u'/branches/xmpp-subprotocols-2178-2'
wc_base = wc_url[len(repos_url):]
# e.g. 'xmpp-subprotocols-2178-2'
svn_branch = wc_url.split("/")[-1]
# if --branch was passed, override the branch name derived above
if options.svn_branch:
svn_branch = options.svn_branch
if options.svn_peg:
wc_url += "@" + str(options.svn_peg)
# Get remote SVN info
ui.status("Retrieving remote SVN info...", level=ui.VERBOSE)
svn_greatest_rev = get_svn_info(wc_url)['last_changed_rev']
if svn_greatest_rev < next_rev:
ui.status("No revisions after %s in SVN repo, nothing to do",
svn_greatest_rev)
return
elif options.svn_rev != None:
if options.svn_rev < next_rev:
ui.status(
"All revisions up to %s are already pulled in, "
"nothing to do", options.svn_rev)
return
svn_greatest_rev = options.svn_rev
# Show incoming changes if in dry-run mode.
if options.dryrun:
ui.status("Incoming SVN revisions:")
for entry in iter_svn_log_entries(wc_url, next_rev, svn_greatest_rev,
options.svnretry):
if entry["message"]:
msg = entry["message"].splitlines()[0].strip()
else:
msg = ""
line = "[%d] %s (%s)" % (entry["revision"], msg, entry["author"])
ui.status(line)
return
# Prepare and/or switch named branches
orig_branch = run_hg(["branch"]).strip()
if orig_branch != svn_branch:
# Update to or create the "pristine" branch
if not hg_switch_branch(orig_branch, svn_branch):
return 1
elif not hg_is_clean(svn_branch):
return 1
# Detect that a previously aborted hgpullsvn retrieved an SVN revision
# without committing it to hg.
# If there is no SVN tag in current head, we may have been interrupted
# during the previous "hg tag".
hgsvn_rev = get_svn_rev_from_hg()
if hgsvn_rev is not None and hgsvn_rev != current_rev:
ui.status(("\nNote: hgsvn repository is in an unclean state "
"(probably because of an aborted hgpullsvn). \n"
"Let's first update to the last good SVN rev."),
level=ui.VERBOSE)
run_svn(["revert", "-R", "."])
run_svn(["up", "--ignore-externals", "-r", hgsvn_rev, svn_wc])
next_rev = hgsvn_rev + 1
# Reset working branch to last svn head to have a clean and linear SVN
# history.
heads_before = None
if hgsvn_rev is None:
heads_before = run_hg(["heads", "--template",
"{node}%s" % os.linesep]).splitlines()
run_hg(["update", "-C", "svn.%d" % current_rev])
# Load SVN log starting from current rev
it_log_entries = iter_svn_log_entries(wc_url, next_rev, svn_greatest_rev,
options.svnretry)
try:
try:
for log_entry in it_log_entries:
current_rev = pull_svn_rev(log_entry, current_rev, svn_wc,
wc_url, wc_base, options.svnretry)
if current_rev is None:
return 1
ui.status("Pulled r%d %s (%s)", log_entry["revision"],
log_entry["message"], log_entry["author"])
# TODO: detect externals with "svn status" and update them as well
finally:
if heads_before is not None: # we have reset the SVN branch
heads_now = run_hg(
["heads", "--template",
"{node}%s" % os.linesep]).splitlines()
if len(heads_now) != len(heads_before):
ui.status("created new head in branch '%s'", svn_branch)
work_branch = orig_branch or svn_branch
if work_branch != svn_branch:
run_hg(["up", '-C', work_branch])
run_hg(["branch", work_branch])
except KeyboardInterrupt:
ui.status("\nStopped by user.", level=ui.ERROR)
except ExternalCommandFailed, e:
ui.status(str(e), level=ui.ERROR)
def real_main(options, args):
if check_for_applied_patches():
print ("There are applied mq patches. Put them aside before "
"running hgpullsvn.")
return 1
svn_wc = "."
# Get SVN info
svn_info = get_svn_info('.')
current_rev = svn_info['revision']
next_rev = current_rev + 1
# e.g. u'svn://svn.twistedmatrix.com/svn/Twisted'
repos_url = svn_info['repos_url']
# e.g. u'svn://svn.twistedmatrix.com/svn/Twisted/branches/xmpp-subprotocols-2178-2'
wc_url = svn_info['url']
assert wc_url.startswith(repos_url)
# e.g. u'/branches/xmpp-subprotocols-2178-2'
wc_base = wc_url[len(repos_url):]
# e.g. 'xmpp-subprotocols-2178-2'
svn_branch = wc_url.split("/")[-1]
# if --branch was passed, override the branch name derived above
if options.svn_branch:
svn_branch = options.svn_branch
if options.svn_peg:
wc_url += "@" + str(options.svn_peg)
# Get remote SVN info
ui.status("Retrieving remote SVN info...", level=ui.VERBOSE)
svn_greatest_rev = get_svn_info(wc_url)['last_changed_rev']
if svn_greatest_rev < next_rev:
ui.status("No revisions after %s in SVN repo, nothing to do",
svn_greatest_rev)
return
elif options.svn_rev != None:
if options.svn_rev < next_rev:
ui.status("All revisions up to %s are already pulled in, "
"nothing to do",
options.svn_rev)
return
svn_greatest_rev = options.svn_rev
# Show incoming changes if in dry-run mode.
if options.dryrun:
ui.status("Incoming SVN revisions:")
for entry in iter_svn_log_entries(wc_url, next_rev, svn_greatest_rev,
options.svnretry):
if entry["message"]:
msg = entry["message"].splitlines()[0].strip()
else:
msg = ""
line = "[%d] %s (%s)" % (entry["revision"], msg, entry["author"])
ui.status(line)
return
# Prepare and/or switch named branches
orig_branch = run_hg(["branch"]).strip()
if orig_branch != svn_branch:
# Update to or create the "pristine" branch
if not hg_switch_branch(orig_branch, svn_branch):
return 1
elif not hg_is_clean(svn_branch):
return 1
# Detect that a previously aborted hgpullsvn retrieved an SVN revision
# without committing it to hg.
# If there is no SVN tag in current head, we may have been interrupted
# during the previous "hg tag".
hgsvn_rev = get_svn_rev_from_hg()
if hgsvn_rev is not None and hgsvn_rev != current_rev:
ui.status(("\nNote: hgsvn repository is in an unclean state "
"(probably because of an aborted hgpullsvn). \n"
"Let's first update to the last good SVN rev."),
level=ui.VERBOSE)
run_svn(["revert", "-R", "."])
run_svn(["up", "--ignore-externals", "-r", hgsvn_rev, svn_wc])
next_rev = hgsvn_rev + 1
# Reset working branch to last svn head to have a clean and linear SVN
# history.
heads_before = None
if hgsvn_rev is None:
heads_before = run_hg(["heads", "--template",
"{node}%s" % os.linesep]).splitlines()
run_hg(["update", "-C", "svn.%d" % current_rev])
# Load SVN log starting from current rev
it_log_entries = iter_svn_log_entries(wc_url, next_rev, svn_greatest_rev, options.svnretry)
try:
try:
for log_entry in it_log_entries:
current_rev = pull_svn_rev(log_entry, current_rev,
svn_wc, wc_url, wc_base, options.svnretry)
if current_rev is None:
return 1
ui.status("Pulled r%d %s (%s)", log_entry["revision"],
log_entry["message"], log_entry["author"])
# TODO: detect externals with "svn status" and update them as well
finally:
if heads_before is not None: # we have reset the SVN branch
heads_now = run_hg(["heads", "--template",
"{node}%s" % os.linesep]).splitlines()
if len(heads_now) != len(heads_before):
ui.status("created new head in branch '%s'", svn_branch)
work_branch = orig_branch or svn_branch
if work_branch != svn_branch:
run_hg(["up", '-C', work_branch])
run_hg(["branch", work_branch])
except KeyboardInterrupt:
ui.status("\nStopped by user.", level=ui.ERROR)
except ExternalCommandFailed, e:
ui.status(str(e), level=ui.ERROR)
"Ignoring warnings about untracked files: '%s'" %
str(e),
level=ui.VERBOSE)
else:
raise
hg_commit_from_svn_log_entry(log_entry)
elif unrelated_paths:
detect_overwritten_svn_branch(wc_url, svn_rev)
# NOTE: in Python 2.5, KeyboardInterrupt isn't a subclass of Exception anymore
except (Exception, KeyboardInterrupt), e:
ui.status("\nInterrupted, please wait for cleanup!\n", level=ui.ERROR)
# NOTE: at this point, running SVN sometimes gives "write lock failures"
# which leave the WC in a weird state.
time.sleep(0.3)
run_svn(["cleanup"])
hgsvn_rev = get_svn_rev_from_hg()
if hgsvn_rev != svn_rev:
# Unless the tag is there, revert to the last stable state
run_svn(["up", "--ignore-externals", "-r", current_rev, svn_wc])
run_hg(["revert", "--all"])
raise
return svn_rev
def real_main(options, args):
if check_for_applied_patches():
print("There are applied mq patches. Put them aside before "
"running hgpullsvn.")
return 1
svn_wc = "."
except (ExternalCommandFailed), e:
if str(e).find("file is untracked") > 0:
ui.status("Ignoring warnings about untracked files: '%s'" % str(e), level=ui.VERBOSE)
else:
raise
hg_commit_from_svn_log_entry(log_entry)
elif unrelated_paths:
detect_overwritten_svn_branch(wc_url, svn_rev)
# NOTE: in Python 2.5, KeyboardInterrupt isn't a subclass of Exception anymore
except (Exception, KeyboardInterrupt), e:
ui.status("\nInterrupted, please wait for cleanup!\n", level=ui.ERROR)
# NOTE: at this point, running SVN sometimes gives "write lock failures"
# which leave the WC in a weird state.
time.sleep(0.3)
run_svn(["cleanup"])
hgsvn_rev = get_svn_rev_from_hg()
if hgsvn_rev != svn_rev:
# Unless the tag is there, revert to the last stable state
run_svn(["up", "--ignore-externals", "-r", current_rev, svn_wc])
run_hg(["revert", "--all"])
raise
return svn_rev
def real_main(options, args):
if check_for_applied_patches():
print ("There are applied mq patches. Put them aside before "
"running hgpullsvn.")
return 1
svn_wc = "."