hgsubversion: hgsubversion/wrappers.py annotate

annotate hgsubversion/wrappers.py @ 347:537de0300510

Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Fri, 22 May 2009 15:12:31 +0200
parents	4b992ebdecc6
children	62f90781eb10

rev	line source
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	1 import os
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	2
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	3 from hgext import rebase as hgrebase
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	4
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 from mercurial import cmdutil as hgcmdutil
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 from mercurial import commands
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import patch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 from mercurial import hg
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 from mercurial import util as hgutil
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 from mercurial import node
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	11 from mercurial import i18n
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	12
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 from svn import core
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	14 from svn import delta
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	15
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 import cmdutil
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	17 import hg_delta_editor
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	18 import stupid as stupidmod
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	19 import svnwrap
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	20 import util
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	21
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	22 def parent(orig, ui, repo, args, *opts):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	23 """show Mercurial & Subversion parents of the working dir or revision
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	24 """
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	25 if not opts.get('svn', False):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	26 return orig(ui, repo, args, *opts)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	27 hge = hg_delta_editor.HgChangeReceiver(repo=repo)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	28 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	29 hge.revmap.iterkeys()))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	30 ha = cmdutil.parentrev(ui, repo, hge, svn_commit_hashes)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	31 if ha.node() == node.nullid:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	32 raise hgutil.Abort('No parent svn revision!')
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	33 displayer = hgcmdutil.show_changeset(ui, repo, opts, buffered=False)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	34 displayer.show(ha)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	35 return 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	36
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	37
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	38 def outgoing(repo, dest=None, heads=None, force=False):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	39 """show changesets not found in the Subversion repository
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	40 """
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	41 assert dest.capable('subversion')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	42
284 f8f9a2993705 Implement parseurl support (#revision in repository urls) Martijn Pieters <mj@zopatista.com> parents: 283 diff changeset	43 # split off #rev; TODO implement --revision/#rev support
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	44 svnurl, revs, checkout = hg.parseurl(dest.svnurl, heads)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	45 hge = hg_delta_editor.HgChangeReceiver(repo=repo)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	46 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	47 hge.revmap.iterkeys()))
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	48 return util.outgoing_revisions(repo.ui, repo, hge, svn_commit_hashes,
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	49 repo.parents()[0].node())
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	50
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	51
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	52 def diff(orig, ui, repo, args, *opts):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	53 """show a diff of the most recent revision against its parent from svn
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	54 """
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	55 if not opts.get('svn', False) or opts.get('change', None):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	56 return orig(ui, repo, args, *opts)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	57 svn_commit_hashes = {}
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	58 hge = hg_delta_editor.HgChangeReceiver(repo=repo)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	59 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	60 hge.revmap.iterkeys()))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	61 if not opts.get('rev', None):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	62 parent = repo.parents()[0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	63 o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	64 parent.node())
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	65 if o_r:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	66 parent = repo[o_r[-1]].parents()[0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	67 opts['rev'] = ['%s:.' % node.hex(parent.node()), ]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	68 node1, node2 = hgcmdutil.revpair(repo, opts['rev'])
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	69 baserev, _junk = svn_commit_hashes.get(node1, (-1, 'junk', ))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	70 newrev, _junk = svn_commit_hashes.get(node2, (-1, 'junk', ))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	71 it = patch.diff(repo, node1, node2,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	72 opts=patch.diffopts(ui, opts={'git': True,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	73 'show_function': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	74 'ignore_all_space': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	75 'ignore_space_change': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	76 'ignore_blank_lines': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	77 'unified': True,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	78 'text': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	79 }))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	80 ui.write(cmdutil.filterdiff(''.join(it), baserev, newrev))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	81
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	82 def push(repo, dest, force, revs):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	83 """push revisions starting at a specified head back to Subversion.
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	84 """
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	85 assert not revs, 'designated revisions for push remains unimplemented.'
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	86 ui = repo.ui
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	87 svnurl = util.normalize_url(repo.ui.expandpath(dest.svnurl))
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	88 old_encoding = util.swap_out_encoding()
284 f8f9a2993705 Implement parseurl support (#revision in repository urls) Martijn Pieters <mj@zopatista.com> parents: 283 diff changeset	89 # split of #rev; TODO: implement --rev/#rev support
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	90 svnurl, revs, checkout = hg.parseurl(svnurl, revs)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	91 # TODO: do credentials specified in the URL still work?
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	92 user = repo.ui.config('hgsubversion', 'username')
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	93 passwd = repo.ui.config('hgsubversion', 'password')
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	94 svn = svnwrap.SubversionRepo(svnurl, user, passwd)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	95 hge = hg_delta_editor.HgChangeReceiver(repo=repo, uuid=svn.uuid)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	96
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	97 # Check if we are up-to-date with the Subversion repository.
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	98 if hge.last_known_revision() != svn.last_changed_rev:
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	99 # Messages are based on localrepository.push() in localrepo.py:1559.
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	100 # TODO: Ideally, we would behave exactly like other repositories:
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	101 # - push everything by default
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	102 # - handle additional heads in the same way
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	103 # - allow pushing single revisions, branches, tags or heads using
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	104 # the -r/--rev flag.
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	105 if force:
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	106 ui.warn("note: unsynced remote changes!\n")
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	107 else:
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	108 ui.warn("abort: unsynced remote changes!\n")
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	109 return None, 0
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	110
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	111 # Strategy:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	112 # 1. Find all outgoing commits from this head
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	113 if len(repo.parents()) != 1:
271 5278817fe8a1 Add newlines to ui.status calls where needed Daniel Tang <dytang@cs.purdue.edu> parents: 269 diff changeset	114 ui.status('Cowardly refusing to push branch merge\n')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	115 return 1
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	116 workingrev = repo.parents()[0]
267 f000b2392fc2 Push status messages, remove svn flag from opts before passing on Luke Opperman <luke@loppear.com> parents: 266 diff changeset	117 ui.status('searching for changes\n')
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	118 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	119 hge.revmap.iterkeys()))
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	120 outgoing = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes, workingrev.node())
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	121 if not (outgoing and len(outgoing)):
267 f000b2392fc2 Push status messages, remove svn flag from opts before passing on Luke Opperman <luke@loppear.com> parents: 266 diff changeset	122 ui.status('no changes found\n')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	123 return 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	124 while outgoing:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	125 oldest = outgoing.pop(-1)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	126 old_ctx = repo[oldest]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	127 if len(old_ctx.parents()) != 1:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	128 ui.status('Found a branch merge, this needs discussion and '
271 5278817fe8a1 Add newlines to ui.status calls where needed Daniel Tang <dytang@cs.purdue.edu> parents: 269 diff changeset	129 'implementation.\n')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	130 return 1
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	131 base_n = old_ctx.parents()[0].node()
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	132 old_children = repo[base_n].children()
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	133 svnbranch = repo[base_n].branch()
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	134 oldtip = base_n
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	135 samebranchchildren = [c for c in repo[oldtip].children() if c.branch() == svnbranch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	136 and c.node() in svn_commit_hashes]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	137 while samebranchchildren:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	138 oldtip = samebranchchildren[0].node()
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	139 samebranchchildren = [c for c in repo[oldtip].children() if c.branch() == svnbranch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	140 and c.node() in svn_commit_hashes]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	141 # 2. Commit oldest revision that needs to be pushed
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	142 base_revision = svn_commit_hashes[base_n][0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	143 try:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	144 cmdutil.commit_from_rev(ui, repo, old_ctx, hge, svnurl,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	145 base_revision, user, passwd)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	146 except cmdutil.NoFilesException:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	147 ui.warn("Could not push revision %s because it had no changes in svn.\n" %
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	148 old_ctx)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	149 return 1
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	150 # 3. Fetch revisions from svn
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	151 # TODO: this probably should pass in the source explicitly - rev too?
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	152 r = repo.pull(dest, force=force)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	153 assert not r or r == 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	154 # 4. Find the new head of the target branch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	155 oldtipctx = repo[oldtip]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	156 replacement = [c for c in oldtipctx.children() if c not in old_children
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	157 and c.branch() == oldtipctx.branch()]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	158 assert len(replacement) == 1, 'Replacement node came back as: %r' % replacement
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	159 replacement = replacement[0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	160 # 5. Rebase all children of the currently-pushing rev to the new branch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	161 heads = repo.heads(old_ctx.node())
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	162 for needs_transplant in heads:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	163 def extrafn(ctx, extra):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	164 if ctx.node() == oldest:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	165 return
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	166 extra['branch'] = ctx.branch()
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	167 # TODO: can we avoid calling our own rebase wrapper here?
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	168 rebase(hgrebase.rebase, ui, repo, svn=True, svnextrafn=extrafn,
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	169 svnsourcerev=needs_transplant)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	170 repo = hg.repository(ui, hge.path)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	171 for child in repo[replacement.node()].children():
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	172 rebasesrc = node.bin(child.extra().get('rebase_source', node.hex(node.nullid)))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	173 if rebasesrc in outgoing:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	174 while rebasesrc in outgoing:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	175 rebsrcindex = outgoing.index(rebasesrc)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	176 outgoing = (outgoing[0:rebsrcindex] +
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	177 [child.node(), ] + outgoing[rebsrcindex+1:])
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	178 children = [c for c in child.children() if c.branch() == child.branch()]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	179 if children:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	180 child = children[0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	181 rebasesrc = node.bin(child.extra().get('rebase_source', node.hex(node.nullid)))
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	182 # TODO: stop constantly creating the HgChangeReceiver instances.
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	183 hge = hg_delta_editor.HgChangeReceiver(hge.repo, ui_=ui, uuid=svn.uuid)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	184 svn_commit_hashes = dict(zip(hge.revmap.itervalues(), hge.revmap.iterkeys()))
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	185 util.swap_out_encoding(old_encoding)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	186 return 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	187
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	188
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	189 def pull(repo, source, heads=[], force=False):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	190 """pull new revisions from Subversion"""
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	191 assert source.capable('subversion')
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	192 svn_url = source.svnurl
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	193
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	194 # Split off #rev
344 4dfab1b8b7be Mention what failed when given a non-numeric revision to clone/pull. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	195 svn_url, heads, checkout = hg.parseurl(svn_url, heads)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	196 old_encoding = util.swap_out_encoding()
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	197
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	198 # TODO implement skipto support
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	199 skipto_rev = 0
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	200 try:
76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	201 stopat_rev = int(checkout or 0)
76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	202 except ValueError:
344 4dfab1b8b7be Mention what failed when given a non-numeric revision to clone/pull. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	203 raise hgutil.Abort('unrecognised Subversion revision %s: '
4dfab1b8b7be Mention what failed when given a non-numeric revision to clone/pull. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	204 'only numbers work.' % checkout)
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	205
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	206 have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	207 if have_replay and not callable(
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	208 delta.svn_txdelta_apply(None, None, None)[0]): #pragma: no cover
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	209 repo.ui.status('You are using old Subversion SWIG bindings. Replay '
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	210 'will not work until you upgrade to 1.5.0 or newer. '
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	211 'Falling back to a slower method that may be buggier. '
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	212 'Please upgrade, or contribute a patch to use the '
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	213 'ctypes bindings instead of SWIG.\n')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	214 have_replay = False
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	215 elif not have_replay:
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	216 repo.ui.note('fetching stupidly...\n')
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	217
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	218 # TODO: do credentials specified in the URL still work?
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	219 user = repo.ui.config('hgsubversion', 'username')
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	220 passwd = repo.ui.config('hgsubversion', 'password')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	221 svn = svnwrap.SubversionRepo(svn_url, user, passwd)
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	222 hg_editor = hg_delta_editor.HgChangeReceiver(repo=repo, subdir=svn.subdir,
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	223 uuid=svn.uuid)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	224
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	225 start = max(hg_editor.last_known_revision(), skipto_rev)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	226 initializing_repo = (hg_editor.last_known_revision() <= 0)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	227 ui = repo.ui
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	228
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	229 if initializing_repo and start > 0:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	230 raise hgutil.Abort('Revision skipping at repository initialization '
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	231 'remains unimplemented.')
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	232
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	233 revisions = 0
521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	234
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	235 try:
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	236 # start converting revisions
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	237 for r in svn.revisions(start=start, stop=stopat_rev):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	238 if (r.author is None and
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	239 r.message == 'This is an empty revision for padding.'):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	240 continue
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	241 hg_editor.update_branch_tag_map_for_rev(r)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	242 # got a 502? Try more than once!
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	243 tries = 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	244 converted = False
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	245 while not converted:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	246 try:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	247 util.describe_revision(ui, r)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	248 if have_replay:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	249 try:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	250 cmdutil.replay_convert_rev(hg_editor, svn, r)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	251 except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	252 ui.status('%s\n' % e.message)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	253 stupidmod.print_your_svn_is_old_message(ui)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	254 have_replay = False
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	255 stupidmod.svn_server_pull_rev(ui, svn, hg_editor, r)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	256 else:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	257 stupidmod.svn_server_pull_rev(ui, svn, hg_editor, r)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	258 converted = True
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	259 except core.SubversionException, e: #pragma: no cover
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	260 if (e.apr_err == core.SVN_ERR_RA_DAV_REQUEST_FAILED
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	261 and '502' in str(e)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	262 and tries < 3):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	263 tries += 1
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	264 ui.status('Got a 502, retrying (%s)\n' % tries)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	265 else:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	266 raise hgutil.Abort(*e.args)
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	267 revisions += 1
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	268 except KeyboardInterrupt:
76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	269 pass
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	270 finally:
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	271 util.swap_out_encoding(old_encoding)
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	272
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	273 if revisions == 0:
521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	274 ui.status(i18n._("no changes found\n"))
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	275 return 0
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	276 else:
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	277 ui.status("pulled %d revisions\n" % revisions)
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	278
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	279 def rebase(orig, ui, repo, **opts):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	280 """rebase current unpushed revisions onto the Subversion head
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	281
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	282 This moves a line of development from making its own head to the top of
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	283 Subversion development, linearizing the changes. In order to make sure you
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	284 rebase on top of the current top of Subversion work, you should probably run
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	285 'hg svn pull' before running this.
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	286
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	287 Also looks for svnextrafn and svnsourcerev in **opts.
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	288 """
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	289 if not opts.get('svn', False):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	290 return orig(ui, repo, **opts)
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	291 def extrafn2(ctx, extra):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	292 """defined here so we can add things easily.
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	293 """
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	294 extra['branch'] = ctx.branch()
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	295 extrafn = opts.get('svnextrafn', extrafn2)
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	296 sourcerev = opts.get('svnsourcerev', repo.parents()[0].node())
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	297 hge = hg_delta_editor.HgChangeReceiver(repo=repo)
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	298 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	299 hge.revmap.iterkeys()))
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	300 o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes, sourcerev=sourcerev)
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	301 if not o_r:
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	302 ui.status('Nothing to rebase!\n')
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	303 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	304 if len(repo[sourcerev].children()):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	305 ui.status('Refusing to rebase non-head commit like a coward\n')
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	306 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	307 parent_rev = repo[o_r[-1]].parents()[0]
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	308 target_rev = parent_rev
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	309 p_n = parent_rev.node()
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	310 exhausted_choices = False
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	311 while target_rev.children() and not exhausted_choices:
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	312 for c in target_rev.children():
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	313 exhausted_choices = True
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	314 n = c.node()
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	315 if (n in svn_commit_hashes and
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	316 svn_commit_hashes[n][1] == svn_commit_hashes[p_n][1]):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	317 target_rev = c
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	318 exhausted_choices = False
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	319 break
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	320 if parent_rev == target_rev:
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	321 ui.status('Already up to date!\n')
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	322 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	323 return orig(ui, repo, dest=node.hex(target_rev.node()),
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	324 base=node.hex(sourcerev),
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	325 extrafn=extrafn)

Mercurial > hgsubversion

annotate hgsubversion/wrappers.py @ 347:537de0300510