hgsubversion: hgsubversion/wrappers.py annotate

annotate hgsubversion/wrappers.py @ 713:69c0e7c4faf9

clone: call the wrapped function (fixes #181) This is a regression that was brought to my attention in #mercurial: hgsubversion breaks the --update flag. The cause is that we call hg.clone() directly rather than the original wrapped function. A comment in 'wrapper.py' noted that the call to hg.clone() should be kept in sync with 'mercurial/commands.py'. That didn't happen. The original reason for calling hg.clone() directly was that we needed its return values. Another wrapper is added (and cleared) within clone() to get them anyway.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Wed, 29 Sep 2010 18:04:26 +0200
parents	385213d2e2da
children	467b95348e6a

rev	line source
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	1 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	2
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	3 from mercurial import cmdutil
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	4 from mercurial import patch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 from mercurial import hg
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 from mercurial import util as hgutil
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import node
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	8 from mercurial import i18n
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	9 from mercurial import extensions
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	10
435 7c576ae19d80 replay: start new replay module that has the relevant functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	11 import replay
438 e8f13bd20467 pushmod: split push functions out into separate module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	12 import pushmod
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 import stupid as stupidmod
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	14 import svnwrap
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	15 import svnrepo
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 import util
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	17
366 25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	18 pullfuns = {
435 7c576ae19d80 replay: start new replay module that has the relevant functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	19 True: replay.convert_rev,
366 25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	20 False: stupidmod.convert_rev,
25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	21 }
25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	22
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	23 revmeta = [
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	24 ('revision', 'revnum'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	25 ('user', 'author'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	26 ('date', 'date'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	27 ('message', 'message'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	28 ]
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	29
507 4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	30
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	31 def version(orig, ui, args, *opts):
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	32 svn = opts.pop('svn', None)
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	33 orig(ui, args, *opts)
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	34 if svn:
664 5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	35 svnversion, bindings = svnwrap.version()
5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	36 ui.status('\n')
507 4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	37 ui.status('hgsubversion: %s\n' % util.version(ui))
664 5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	38 ui.status('Subversion: %s\n' % svnversion)
5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	39 ui.status('bindings: %s\n' % bindings)
507 4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	40
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	41
403 37c96b78b8c0 uisetup: use a single loop/abstraction for wrapping all the commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 402 diff changeset	42 def parents(orig, ui, repo, args, *opts):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	43 """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	44 """
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	45 if not opts.get('svn', False):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	46 return orig(ui, repo, args, *opts)
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	47 meta = repo.svnmeta()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	48 hashes = meta.revmap.hashes()
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	49 ha = util.parentrev(ui, repo, meta, hashes)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	50 if ha.node() == node.nullid:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	51 raise hgutil.Abort('No parent svn revision!')
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	52 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=False)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	53 displayer.show(ha)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	54 return 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	55
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	56
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	57 def incoming(orig, ui, repo, source='default', **opts):
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	58 """show incoming revisions from Subversion
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	59 """
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	60
555 cbd7065e6ab4 util: add parseurl method to abstract away differences between 1.4 and 1.5 Augie Fackler <durin42@gmail.com> parents: 523 diff changeset	61 source, revs, checkout = util.parseurl(ui.expandpath(source))
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	62 other = hg.repository(ui, source)
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	63 if 'subversion' not in other.capabilities:
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	64 return orig(ui, repo, source, **opts)
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	65
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	66 meta = repo.svnmeta()
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	67
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	68 ui.status('incoming changes from %s\n' % other.svnurl)
647 3ff8666b1479 maps: rename revmap.seen to revmap.youngest; add revmap.oldest. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 626 diff changeset	69 for r in other.svn.revisions(start=meta.revmap.youngest):
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	70 ui.status('\n')
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	71 for label, attr in revmeta:
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	72 l1 = label + ':'
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	73 val = str(getattr(r, attr)).strip()
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	74 if not ui.verbose:
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	75 val = val.split('\n')[0]
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	76 ui.status('%s%s\n' % (l1.ljust(13), val))
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	77
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	78
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	79 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	80 """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	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 assert dest.capable('subversion')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	83
284 f8f9a2993705 Implement parseurl support (#revision in repository urls) Martijn Pieters <mj@zopatista.com> parents: 283 diff changeset	84 # split off #rev; TODO implement --revision/#rev support
555 cbd7065e6ab4 util: add parseurl method to abstract away differences between 1.4 and 1.5 Augie Fackler <durin42@gmail.com> parents: 523 diff changeset	85 svnurl, revs, checkout = util.parseurl(dest.svnurl, heads)
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	86 meta = repo.svnmeta()
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	87 parent = repo.parents()[0].node()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	88 hashes = meta.revmap.hashes()
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	89 return util.outgoing_revisions(repo, hashes, parent)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	90
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	91
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	92 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	93 """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	94 """
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	95 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	96 return orig(ui, repo, args, *opts)
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	97 meta = repo.svnmeta()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	98 hashes = meta.revmap.hashes()
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	99 if not opts.get('rev', None):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	100 parent = repo.parents()[0]
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	101 o_r = util.outgoing_revisions(repo, hashes, parent.node())
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	102 if o_r:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	103 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	104 opts['rev'] = ['%s:.' % node.hex(parent.node()), ]
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	105 node1, node2 = cmdutil.revpair(repo, opts['rev'])
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	106 baserev, _junk = hashes.get(node1, (-1, 'junk'))
e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	107 newrev, _junk = hashes.get(node2, (-1, 'junk'))
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	108 it = patch.diff(repo, node1, node2,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	109 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	110 'show_function': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	111 'ignore_all_space': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	112 'ignore_space_change': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	113 'ignore_blank_lines': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	114 'unified': True,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	115 'text': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	116 }))
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	117 ui.write(util.filterdiff(''.join(it), baserev, newrev))
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	118
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	119 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	120 """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	121 """
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	122 assert not revs, 'designated revisions for push remains unimplemented.'
461 db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 444 diff changeset	123 cmdutil.bail_if_changed(repo)
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	124 ui = repo.ui
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	125 old_encoding = util.swap_out_encoding()
466 9548b406a2d8 pushmod: pass SubversionRepo directly to commit() Patrick Mezard <pmezard@gmail.com> parents: 464 diff changeset	126 # 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	127 # TODO: do credentials specified in the URL still work?
466 9548b406a2d8 pushmod: pass SubversionRepo directly to commit() Patrick Mezard <pmezard@gmail.com> parents: 464 diff changeset	128 svnurl = repo.ui.expandpath(dest.svnurl)
608 d1de8bb6e11f push: remove superfluous creation of a new `svnremoterepo' instance. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 606 diff changeset	129 svn = dest.svn
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	130 meta = repo.svnmeta(svn.uuid)
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	131
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	132 # Strategy:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	133 # 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	134 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	135 ui.status('Cowardly refusing to push branch merge\n')
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 620 diff changeset	136 return 0 # results in nonzero exit status, see hg's commands.py
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	137 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	138 ui.status('searching for changes\n')
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	139 hashes = meta.revmap.hashes()
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	140 outgoing = util.outgoing_revisions(repo, hashes, workingrev.node())
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	141 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	142 ui.status('no changes found\n')
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 620 diff changeset	143 return 1 # so we get a sane exit status, see hg's commands.push
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	144 while outgoing:
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	145
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	146 # 2. Commit oldest revision that needs to be pushed
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	147 oldest = outgoing.pop(-1)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	148 old_ctx = repo[oldest]
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	149 old_pars = old_ctx.parents()
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	150 if len(old_pars) != 1:
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	151 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	152 'implementation.\n')
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 620 diff changeset	153 return 0 # results in nonzero exit status, see hg's commands.py
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	154 # We will commit to svn against this node's parent rev. Any file-level
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	155 # conflicts here will result in an error reported by svn.
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	156 base_ctx = old_pars[0]
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	157 base_revision = hashes[base_ctx.node()][0]
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	158 svnbranch = base_ctx.branch()
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	159 # Find most recent svn commit we have on this branch.
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	160 # This node will become the nearest known ancestor of the pushed rev.
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	161 oldtipctx = base_ctx
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	162 old_children = oldtipctx.descendants()
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	163 seen = set(c.node() for c in old_children)
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	164 samebranchchildren = [c for c in old_children if c.branch() == svnbranch
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	165 and c.node() in hashes]
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	166 if samebranchchildren:
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	167 # The following relies on descendants being sorted by rev.
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	168 oldtipctx = samebranchchildren[-1]
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	169 # All set, so commit now.
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	170 try:
466 9548b406a2d8 pushmod: pass SubversionRepo directly to commit() Patrick Mezard <pmezard@gmail.com> parents: 464 diff changeset	171 pushmod.commit(ui, repo, old_ctx, meta, base_revision, svn)
438 e8f13bd20467 pushmod: split push functions out into separate module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	172 except pushmod.NoFilesException:
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	173 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	174 old_ctx)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	175 return 1
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	176
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	177 # 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	178 # 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	179 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	180 assert not r or r == 0
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	181
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	182 # 4. Find the new head of the target branch
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	183 # We expect to get our own new commit back, but we might also get other
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	184 # commits that happened since our last pull, or even right after our own
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	185 # commit (race).
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	186 for c in oldtipctx.descendants():
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	187 if c.node() not in seen and c.branch() == svnbranch:
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	188 newtipctx = c
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	189
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	190 # 5. Rebase all children of the currently-pushing rev to the new head
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	191 heads = repo.heads(old_ctx.node())
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	192 for needs_transplant in heads:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	193 def extrafn(ctx, extra):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	194 if ctx.node() == oldest:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	195 return
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	196 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	197 # 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	198 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	199 svnsourcerev=needs_transplant)
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	200 # Reload the repo after the rebase. Do not reuse contexts across this.
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	201 newtip = newtipctx.node()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	202 repo = hg.repository(ui, meta.path)
691 a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	203 newtipctx = repo[newtip]
a45365f1492a push: fix case where we get >1 revs back after svn commit Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 664 diff changeset	204 # Rewrite the node ids in outgoing to their rebased versions.
692 42879fddf727 push: simplify code for remapping rebased node ids Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 691 diff changeset	205 rebasemap = dict()
42879fddf727 push: simplify code for remapping rebased node ids Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 691 diff changeset	206 for child in newtipctx.descendants():
42879fddf727 push: simplify code for remapping rebased node ids Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 691 diff changeset	207 rebasesrc = child.extra().get('rebase_source')
42879fddf727 push: simplify code for remapping rebased node ids Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 691 diff changeset	208 if rebasesrc:
42879fddf727 push: simplify code for remapping rebased node ids Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 691 diff changeset	209 rebasemap[node.bin(rebasesrc)] = child.node()
42879fddf727 push: simplify code for remapping rebased node ids Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 691 diff changeset	210 outgoing = [rebasemap.get(n) or n for n in outgoing]
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	211 # TODO: stop constantly creating the SVNMeta instances.
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	212 meta = repo.svnmeta(svn.uuid)
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	213 hashes = meta.revmap.hashes()
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	214 util.swap_out_encoding(old_encoding)
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 620 diff changeset	215 return 1 # so we get a sane exit status, see hg's commands.push
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	216
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	217
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	218 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	219 """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	220 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	221 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	222
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	223 # Split off #rev
555 cbd7065e6ab4 util: add parseurl method to abstract away differences between 1.4 and 1.5 Augie Fackler <durin42@gmail.com> parents: 523 diff changeset	224 svn_url, heads, checkout = util.parseurl(svn_url, heads)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	225 old_encoding = util.swap_out_encoding()
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	226
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	227 try:
76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	228 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	229 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	230 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	231 '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	232
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	233 have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
600 a42e9c9bbb8a wrappers: remove unused code for compatibility with Subversion 1.4. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 589 diff changeset	234 if not have_replay:
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	235 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	236
604 1290ab9def8f pull: fix passing credentials in URL. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 602 diff changeset	237 svn = source.svn
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	238 meta = repo.svnmeta(svn.uuid, svn.subdir)
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	239
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	240 layout = repo.ui.config('hgsubversion', 'layout', 'auto')
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	241 if layout == 'auto':
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	242 rootlist = svn.list_dir('', revision=(stopat_rev or None))
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	243 if sum(map(lambda x: x in rootlist, ('branches', 'tags', 'trunk'))):
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	244 layout = 'standard'
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	245 else:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	246 layout = 'single'
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	247 repo.ui.setconfig('hgsubversion', 'layout', layout)
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	248 repo.ui.note('using %s layout\n' % layout)
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	249
701 3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	250 branch = repo.ui.config('hgsubversion', 'branch')
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	251 if branch:
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	252 if layout != 'single':
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	253 msg = ('branch cannot be specified for Subversion clones using '
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	254 'standard directory layout')
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	255 raise hgutil.Abort(msg)
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	256
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	257 meta.branchmap['default'] = branch
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	258
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	259 ui = repo.ui
651 827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	260 start = meta.revmap.youngest
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	261 origrevcount = len(meta.revmap)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	262
651 827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	263 if start <= 0:
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	264 # we are initializing a new repository
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	265 start = repo.ui.config('hgsubversion', 'startrev', 0)
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	266 if isinstance(start, str) and start.upper() == 'HEAD':
657 9cf547fc36e8 pull: fix shallow clone when lastest change isn't HEAD. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 651 diff changeset	267 start = svn.last_changed_rev
651 827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	268 else:
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	269 start = int(start)
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	270
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	271 if start > 0:
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	272 if layout == 'standard':
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	273 raise hgutil.Abort('non-zero start revisions are only '
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	274 'supported for single-directory clones.')
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	275 ui.note('starting at revision %d; any prior will be ignored\n'
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	276 % start)
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	277 # fetch all revisions including the one specified...
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	278 start -= 1
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	279
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	280 # anything less than zero makes no sense
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	281 if start < 0:
827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	282 start = 0
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	283
523 fa7aab230f1d wrappers: calculate and return exact count of changesets added. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 520 diff changeset	284 oldrevisions = len(meta.revmap)
559 66a8bdff9ced pull: report progress to ui.progress so progress bars can appear Augie Fackler <durin42@gmail.com> parents: 555 diff changeset	285 if stopat_rev:
66a8bdff9ced pull: report progress to ui.progress so progress bars can appear Augie Fackler <durin42@gmail.com> parents: 555 diff changeset	286 total = stopat_rev - start
66a8bdff9ced pull: report progress to ui.progress so progress bars can appear Augie Fackler <durin42@gmail.com> parents: 555 diff changeset	287 else:
66a8bdff9ced pull: report progress to ui.progress so progress bars can appear Augie Fackler <durin42@gmail.com> parents: 555 diff changeset	288 total = svn.HEAD - start
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	289 try:
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	290 try:
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	291 # start converting revisions
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	292 for r in svn.revisions(start=start, stop=stopat_rev):
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	293 if (r.author is None and
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	294 r.message == 'This is an empty revision for padding.'):
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	295 continue
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	296 tbdelta = meta.update_branch_tag_map_for_rev(r)
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	297 # got a 502? Try more than once!
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	298 tries = 0
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	299 converted = False
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	300 while not converted:
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	301 try:
561 312c8c98eeff pull: handle commits without any commit message Augie Fackler <durin42@gmail.com> parents: 560 diff changeset	302 msg = ''
312c8c98eeff pull: handle commits without any commit message Augie Fackler <durin42@gmail.com> parents: 560 diff changeset	303 if r.message:
312c8c98eeff pull: handle commits without any commit message Augie Fackler <durin42@gmail.com> parents: 560 diff changeset	304 msg = r.message.strip()
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	305 if not msg:
612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	306 msg = util.default_commit_msg
612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	307 else:
612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	308 msg = [s.strip() for s in msg.splitlines() if s][0]
612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	309 w = hgutil.termwidth()
612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	310 bits = (r.revnum, r.author, msg)
606 789eec0a339c wrappers: fix pull output if termwidth() is inexact Patrick Mezard <pmezard@gmail.com> parents: 604 diff changeset	311 ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
602 7c44bc259505 wrappers.pull: fix calculation of progress totals. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	312 util.progress(ui, 'pull', r.revnum - start, total=total)
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	313
444 8c545dcad7b1 wrappers: save tbdelta in one place for both stupid and replay Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 440 diff changeset	314 meta.save_tbdelta(tbdelta)
432 4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	315 close = pullfuns[have_replay](ui, meta, svn, r, tbdelta)
520 5a5b90a6d522 svnmeta: internalize tags delta Patrick Mezard <pmezard@gmail.com> parents: 507 diff changeset	316 meta.committags(r, close)
432 4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	317 for branch, parent in close.iteritems():
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	318 if parent in (None, node.nullid):
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	319 continue
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	320 meta.delbranch(branch, parent, r)
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	321
418 92beeefeaf93 save metadata from one place Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	322 meta.save()
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	323 converted = True
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	324
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	325 except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	326 ui.status('%s\n' % e.message)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	327 stupidmod.print_your_svn_is_old_message(ui)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	328 have_replay = False
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 600 diff changeset	329 except svnwrap.SubversionException, e: #pragma: no cover
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 600 diff changeset	330 if (e.args[1] == svnwrap.ERR_RA_DAV_REQUEST_FAILED
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	331 and '502' in str(e)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	332 and tries < 3):
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	333 tries += 1
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	334 ui.status('Got a 502, retrying (%s)\n' % tries)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	335 else:
705 385213d2e2da pull: reveal the handled SubversionException to --traceback. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 701 diff changeset	336 ui.traceback()
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	337 raise hgutil.Abort(*e.args)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	338 except KeyboardInterrupt:
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	339 pass
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	340 finally:
602 7c44bc259505 wrappers.pull: fix calculation of progress totals. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	341 util.progress(ui, 'pull', None, total=total)
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	342 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	343
523 fa7aab230f1d wrappers: calculate and return exact count of changesets added. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 520 diff changeset	344 revisions = len(meta.revmap) - oldrevisions
fa7aab230f1d wrappers: calculate and return exact count of changesets added. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 520 diff changeset	345
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	346 if revisions == 0:
521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	347 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	348 return 0
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	349 else:
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	350 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	351
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	352 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	353 """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	354
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	355 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	356 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	357 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	358 '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	359
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	360 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	361 """
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	362 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	363 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	364 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	365 """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	366 """
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	367 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	368 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	369 sourcerev = opts.get('svnsourcerev', repo.parents()[0].node())
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	370 meta = repo.svnmeta()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	371 hashes = meta.revmap.hashes()
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	372 o_r = util.outgoing_revisions(repo, hashes, sourcerev=sourcerev)
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	373 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	374 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	375 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	376 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	377 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	378 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	379 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	380 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	381 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	382 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	383 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	384 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	385 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	386 n = c.node()
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	387 if (n in hashes and hashes[n][1] == hashes[p_n][1]):
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	388 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	389 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	390 break
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	391 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	392 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	393 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	394 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	395 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	396 extrafn=extrafn)
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	397
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	398
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	399 optionmap = {
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	400 'tagpaths': ('hgsubversion', 'tagpaths'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	401 'authors': ('hgsubversion', 'authormap'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	402 'filemap': ('hgsubversion', 'filemap'),
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 561 diff changeset	403 'branchmap': ('hgsubversion', 'branchmap'),
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	404 'stupid': ('hgsubversion', 'stupid'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	405 'defaulthost': ('hgsubversion', 'defaulthost'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	406 'defaultauthors': ('hgsubversion', 'defaultauthors'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	407 'usebranchnames': ('hgsubversion', 'usebranchnames'),
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	408 'layout': ('hgsubversion', 'layout'),
651 827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	409 'startrev': ('hgsubversion', 'startrev'),
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	410 }
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	411
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	412 dontretain = { 'hgsubversion': set(['authormap', 'filemap', 'layout', ]) }
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	413
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	414 def clone(orig, ui, source, dest=None, **opts):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	415 """
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	416 Some of the options listed below only apply to Subversion
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	417 %(target)s. See 'hg help %(extension)s' for more information on
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	418 them as well as other ways of customising the conversion process.
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	419 """
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	420
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	421 data = {}
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	422 def hgclonewrapper(orig, ui, origsource, dest, **opts):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	423 if isinstance(origsource, str):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	424 source, branch, checkout = util.parseurl(ui.expandpath(origsource),
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	425 opts.get('branch'))
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	426 srcrepo = hg.repository(ui, source)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	427 else:
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	428 srcrepo = origsource
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	429
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	430 if srcrepo.capable('subversion'):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	431 branches = opts.pop('branch', None)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	432 if branches:
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	433 data['branches'] = branches
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	434 ui.setconfig('hgsubversion', 'branch', branches[-1])
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	435
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	436 data['srcrepo'], data['dstrepo'] = orig(ui, origsource, dest, **opts)
701 3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	437
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	438 for opt, (section, name) in optionmap.iteritems():
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	439 if opt in opts and opts[opt]:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	440 ui.setconfig(section, name, str(opts.pop(opt)))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	441
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	442 # calling hg.clone directoly to get the repository instances it returns,
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	443 # breaks in subtle ways, so we double-wrap
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	444 orighgclone = extensions.wrapfunction(hg, 'clone', hgclonewrapper)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	445 orig(ui, source, dest, **opts)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	446 hg.clone = orighgclone
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	447
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	448 # do this again; the ui instance isn't shared between the wrappers
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	449 if data.get('branches'):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	450 ui.setconfig('hgsubversion', 'branch', data['branches'][-1])
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	451
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	452 dstrepo = data.get('dstrepo')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	453 srcrepo = data.get('srcrepo')
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	454
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	455 if dstrepo.local() and srcrepo.capable('subversion'):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	456 fd = dstrepo.opener("hgrc", "a", text=True)
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	457 for section in set(s for s, v in optionmap.itervalues()):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	458 config = dict(ui.configitems(section))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	459 for name in dontretain[section]:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	460 config.pop(name, None)
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	461
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	462 if config:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	463 fd.write('\n[%s]\n' % section)
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	464 map(fd.write, ('%s = %s\n' % p for p in config.iteritems()))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	465
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	466
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	467 def generic(orig, ui, repo, args, *opts):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	468 """
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	469 Subversion %(target)s can be used for %(command)s. See 'hg help
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	470 %(extension)s' for more on the conversion process.
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	471 """
701 3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	472
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	473 branch = opts.get('branch', None)
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	474 if branch:
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	475 ui.setconfig('hgsubversion', 'branch', branch[-1])
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	476
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	477 for opt, (section, name) in optionmap.iteritems():
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	478 if opt in opts and opts[opt]:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	479 if isinstance(repo, str):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	480 ui.setconfig(section, name, opts.pop(opt))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	481 else:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	482 repo.ui.setconfig(section, name, opts.pop(opt))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	483 return orig(ui, repo, args, *opts)

Mercurial > hgsubversion

annotate hgsubversion/wrappers.py @ 713:69c0e7c4faf9