Mercurial > hgsubversion

comparison wrappers.py @ 260:87dc4d0dd048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Forgot some return statements.
author Augie Fackler <durin42@gmail.com>
date Fri, 10 Apr 2009 22:45:50 -0500
parents ffccf0080e54
children 141513b5173b
comparison
equal deleted inserted replaced
259:52cc0982dfcd 260:87dc4d0dd048
91 def push(orig, ui, repo, dest=None, *args, **opts): 91 def push(orig, ui, repo, dest=None, *args, **opts):
92 """push revisions starting at a specified head back to Subversion. 92 """push revisions starting at a specified head back to Subversion.
93 """ 93 """
94 svnurl = repo.ui.expandpath(dest or 'default-push', dest or 'default') 94 svnurl = repo.ui.expandpath(dest or 'default-push', dest or 'default')
95 if not cmdutil.issvnurl(svnurl): 95 if not cmdutil.issvnurl(svnurl):
96 orig(ui, repo, dest=dest, *args, **opts) 96 return orig(ui, repo, dest=dest, *args, **opts)
97 old_encoding = util.swap_out_encoding() 97 old_encoding = util.swap_out_encoding()
98 hge = hg_delta_editor.HgChangeReceiver(repo=repo) 98 hge = hg_delta_editor.HgChangeReceiver(repo=repo)
99 svnurl = util.normalize_url(svnurl) 99 svnurl = util.normalize_url(svnurl)
100 if svnurl != hge.url: 100 if svnurl != hge.url:
101 raise hgutil.Abort('wrong subversion url!') 101 raise hgutil.Abort('wrong subversion url!')
188 You can specify multiple paths for the location of tags using comma 188 You can specify multiple paths for the location of tags using comma
189 separated values. 189 separated values.
190 ''' 190 '''
191 svnurl = ui.expandpath(source) 191 svnurl = ui.expandpath(source)
192 if not cmdutil.issvnurl(svnurl): 192 if not cmdutil.issvnurl(svnurl):
193 orig(ui, source=source, dest=dest, *args, **opts) 193 return orig(ui, source=source, dest=dest, *args, **opts)
194 194
195 if not dest: 195 if not dest:
196 dest = hg.defaultdest(source) + '-hg' 196 dest = hg.defaultdest(source) + '-hg'
197 ui.status("Assuming destination %s\n" % dest) 197 ui.status("Assuming destination %s\n" % dest)
198 198
227 *args, **opts): 227 *args, **opts):
228 """pull new revisions from Subversion 228 """pull new revisions from Subversion
229 """ 229 """
230 url = ((repo and repo.ui) or ui).expandpath(source) 230 url = ((repo and repo.ui) or ui).expandpath(source)
231 if not (cmdutil.issvnurl(url) or svn or create_new_dest): 231 if not (cmdutil.issvnurl(url) or svn or create_new_dest):
232 orig(ui, repo, source=source, *args, **opts) 232 return orig(ui, repo, source=source, *args, **opts)
233 svn_url = url 233 svn_url = url
234 svn_url = util.normalize_url(svn_url) 234 svn_url = util.normalize_url(svn_url)
235 old_encoding = util.swap_out_encoding() 235 old_encoding = util.swap_out_encoding()
236 # TODO implement skipto support 236 # TODO implement skipto support
237 skipto_rev = 0 237 skipto_rev = 0