hgsubversion: hgsubversion/wrappers.py comparison

comparison 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

comparison

equal deleted inserted replaced

-:4b992ebdecc6
+:537de0300510
 displayer = hgcmdutil.show_changeset(ui, repo, opts, buffered=False)
 displayer.show(ha)
 return 0
-def outgoing(orig, ui, repo, dest=None, *args, **opts):
+def outgoing(repo, dest=None, heads=None, force=False):
 """show changesets not found in the Subversion repository
 """
-svnurl = repo.ui.expandpath(dest or 'default-push', dest or 'default')
+assert dest.capable('subversion')
-if not hg.repository(ui, svnurl).capable('subversion'):
-return orig(ui, repo, dest, *args, **opts)
 # split off #rev; TODO implement --revision/#rev support
-svnurl, revs, checkout = hg.parseurl(svnurl, opts.get('rev'))
+svnurl, revs, checkout = hg.parseurl(dest.svnurl, heads)
 hge = hg_delta_editor.HgChangeReceiver(repo=repo)
 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
 hge.revmap.iterkeys()))
-o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes,
+return util.outgoing_revisions(repo.ui, repo, hge, svn_commit_hashes,
 repo.parents()[0].node())
-if not (o_r and len(o_r)):
-ui.status('no changes found\n')
-return 0
-displayer = hgcmdutil.show_changeset(ui, repo, opts, buffered=False)
-for node in reversed(o_r):
-displayer.show(repo[node])
 def diff(orig, ui, repo, *args, **opts):
 """show a diff of the most recent revision against its parent from svn
 """
 'unified': True,
 'text': False,
 }))
 ui.write(cmdutil.filterdiff(''.join(it), baserev, newrev))
-def push(repo, dest="default", force=False, revs=None):
+def push(repo, dest, force, revs):
 """push revisions starting at a specified head back to Subversion.
 """
 assert not revs, 'designated revisions for push remains unimplemented.'
 ui = repo.ui
-svnurl = util.normalize_url(repo.ui.expandpath(dest))
+svnurl = util.normalize_url(repo.ui.expandpath(dest.svnurl))
 old_encoding = util.swap_out_encoding()
 # split of #rev; TODO: implement --rev/#rev support
 svnurl, revs, checkout = hg.parseurl(svnurl, revs)
 # TODO: do credentials specified in the URL still work?
 user = repo.ui.config('hgsubversion', 'username')
 ui.warn("Could not push revision %s because it had no changes in svn.\n" %
 old_ctx)
 return 1
 # 3. Fetch revisions from svn
 # TODO: this probably should pass in the source explicitly - rev too?
-r = pull(repo, source=dest, force=force)
+r = repo.pull(dest, force=force)
 assert not r or r == 0
 # 4. Find the new head of the target branch
 oldtipctx = repo[oldtip]
 replacement = [c for c in oldtipctx.children() if c not in old_children
 and c.branch() == oldtipctx.branch()]
 svn_commit_hashes = dict(zip(hge.revmap.itervalues(), hge.revmap.iterkeys()))
 util.swap_out_encoding(old_encoding)
 return 0
-def pull(repo, source="default", heads=None, force=False):
+def pull(repo, source, heads=[], force=False):
-"""pull new revisions from Subversion
+"""pull new revisions from Subversion"""
+assert source.capable('subversion')
-Also takes svn, svn_stupid, and create_new_dest kwargs.
+svn_url = source.svnurl
-"""
-url = repo.ui.expandpath(source)
-svn_url = util.normalize_url(url)
 # Split off #rev
 svn_url, heads, checkout = hg.parseurl(svn_url, heads)
 old_encoding = util.swap_out_encoding()
 'only numbers work.' % checkout)
 have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
 if have_replay and not callable(
 delta.svn_txdelta_apply(None, None, None)[0]): #pragma: no cover
-ui.status('You are using old Subversion SWIG bindings. Replay will not'
+repo.ui.status('You are using old Subversion SWIG bindings. Replay '
-' work until you upgrade to 1.5.0 or newer. Falling back to'
+'will not work until you upgrade to 1.5.0 or newer. '
-' a slower method that may be buggier. Please upgrade, or'
+'Falling back to a slower method that may be buggier. '
-' contribute a patch to use the ctypes bindings instead'
+'Please upgrade, or contribute a patch to use the '
-' of SWIG.\n')
+'ctypes bindings instead of SWIG.\n')
 have_replay = False
+elif not have_replay:
+repo.ui.note('fetching stupidly...\n')
 # TODO: do credentials specified in the URL still work?
 user = repo.ui.config('hgsubversion', 'username')
 passwd = repo.ui.config('hgsubversion', 'password')
 svn = svnwrap.SubversionRepo(svn_url, user, passwd)
 'remains unimplemented.')
 revisions = 0
 try:
 # start converting revisions
 for r in svn.revisions(start=start, stop=stopat_rev):
-valid = True
+if (r.author is None and
-hg_editor.update_branch_tag_map_for_rev(r)
+r.message == 'This is an empty revision for padding.'):
-for p in r.paths:
+continue
-if hg_editor._is_path_valid(p):
+hg_editor.update_branch_tag_map_for_rev(r)
-valid = True
-break
-if valid:
 # got a 502? Try more than once!
 tries = 0
 converted = False
 while not converted:
 try:
 else:
 raise hgutil.Abort(*e.args)
 revisions += 1
 except KeyboardInterrupt:
 pass
+finally:
 util.swap_out_encoding(old_encoding)
 if revisions == 0:
 ui.status(i18n._("no changes found\n"))
-return
+return 0
 else:
 ui.status("pulled %d revisions\n" % revisions)
 def rebase(orig, ui, repo, **opts):
 """rebase current unpushed revisions onto the Subversion head

Mercurial > hgsubversion

comparison hgsubversion/wrappers.py @ 347:537de0300510