hgsubversion: hgsubversion/svnwrap/svn_swig

annotate hgsubversion/svnwrap/svn_swig_wrapper.py @ 1330:2fb0f3c377c9

svn_swig_wrapper: add a member to store reference to meta object

author	Sean Farley <sean.michael.farley@gmail.com>
date	Mon, 24 Mar 2014 11:20:56 -0500
parents	131cb06dca76
children	b803ef977748

rev	line source
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	1 import cStringIO
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 511 diff changeset	2 import errno
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import os
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	4 import shutil
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 import sys
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 import tempfile
238 e8b3ca865f93 Fix a boneheaded mistake I made when I touched up a previous patch. Augie Fackler <durin42@gmail.com> parents: 235 diff changeset	7 import urllib
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	8 import collections
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	9
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	10 import common
2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	11
324 c4061e57974c svnwrap: Filter out deprecation warnings on 2.6. Augie Fackler <durin42@gmail.com> parents: 305 diff changeset	12 import warnings
c4061e57974c svnwrap: Filter out deprecation warnings on 2.6. Augie Fackler <durin42@gmail.com> parents: 305 diff changeset	13 warnings.filterwarnings('ignore',
c4061e57974c svnwrap: Filter out deprecation warnings on 2.6. Augie Fackler <durin42@gmail.com> parents: 305 diff changeset	14 module='svn.core',
c4061e57974c svnwrap: Filter out deprecation warnings on 2.6. Augie Fackler <durin42@gmail.com> parents: 305 diff changeset	15 category=DeprecationWarning)
c4061e57974c svnwrap: Filter out deprecation warnings on 2.6. Augie Fackler <durin42@gmail.com> parents: 305 diff changeset	16
607 b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	17 required_bindings = (1, 5, 0)
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	18
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	19 try:
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	20 from svn import client
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	21 from svn import core
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	22 from svn import delta
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	23 from svn import ra
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	24
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	25 current_bindings = (core.SVN_VER_MAJOR, core.SVN_VER_MINOR,
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	26 core.SVN_VER_MICRO)
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	27 except ImportError:
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	28 raise ImportError('Subversion %d.%d.%d or later required, '
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	29 'but no bindings were found' % required_bindings)
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	30
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	31 if current_bindings < required_bindings: # pragma: no cover
607 b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	32 raise ImportError('Subversion %d.%d.%d or later required, '
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	33 'but bindings for %d.%d.%d found' %
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	34 (required_bindings + current_bindings))
b5f1b629c629 svn_swig_wrapper: improved handling of missing or outdated bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	35
196 77812f98e250 Add a naive hg svn version command that works as long as hgsubversion is run from a checkout. Augie Fackler <durin42@gmail.com> parents: 181 diff changeset	36 def version():
664 5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 649 diff changeset	37 return '%d.%d.%d' % current_bindings, 'SWIG'
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	38
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	39 # exported values
1036 e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 1023 diff changeset	40 ERR_FS_ALREADY_EXISTS = core.SVN_ERR_FS_ALREADY_EXISTS
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	41 ERR_FS_CONFLICT = core.SVN_ERR_FS_CONFLICT
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	42 ERR_FS_NOT_FOUND = core.SVN_ERR_FS_NOT_FOUND
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	43 ERR_FS_TXN_OUT_OF_DATE = core.SVN_ERR_FS_TXN_OUT_OF_DATE
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	44 ERR_INCOMPLETE_DATA = core.SVN_ERR_INCOMPLETE_DATA
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	45 ERR_RA_DAV_REQUEST_FAILED = core.SVN_ERR_RA_DAV_REQUEST_FAILED
987 cf53cfaaa050 Fixes bug #358. Display correct error message if a svn pre-commit hook blocks the push Anton Agafonov <equeny@fb.com> parents: 971 diff changeset	46 ERR_REPOS_HOOK_FAILURE = core.SVN_ERR_REPOS_HOOK_FAILURE
964 27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	47 SSL_CNMISMATCH = core.SVN_AUTH_SSL_CNMISMATCH
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	48 SSL_EXPIRED = core.SVN_AUTH_SSL_EXPIRED
1036 e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 1023 diff changeset	49 SSL_NOTYETVALID = core.SVN_AUTH_SSL_NOTYETVALID
964 27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	50 SSL_OTHER = core.SVN_AUTH_SSL_OTHER
1036 e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 1023 diff changeset	51 SSL_UNKNOWNCA = core.SVN_AUTH_SSL_UNKNOWNCA
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	52 SubversionException = core.SubversionException
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	53 Editor = delta.Editor
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	54
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	55 def apply_txdelta(base, target):
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	56 handler, baton = delta.svn_txdelta_apply(cStringIO.StringIO(base),
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	57 target, None)
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	58 return (lambda window: handler(window, baton))
0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 590 diff changeset	59
75 cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	60 def optrev(revnum):
cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	61 optrev = core.svn_opt_revision_t()
cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	62 optrev.kind = core.svn_opt_revision_number
cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	63 optrev.value.number = revnum
cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	64 return optrev
cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	65
971 77b22e5b4ea6 svn_swig_wrapper: Ensure subversion config files Mitsuhiro Koga <shiena.jp@gmail.com> parents: 969 diff changeset	66 core.svn_config_ensure(None)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 47 diff changeset	67 svn_config = core.svn_config_get_config(None)
45 ce00e6ffaa90 Change the implementation of the ra_session stuff. Thanks to Ben Collins-Sussman for pointing out the problem with the other method I was using. Augie Fackler <durin42@gmail.com> parents: 36 diff changeset	68 class RaCallbacks(ra.Callbacks):
298 32d3f1716e66 Two minor optimisations/cleanups for svn_swig_wrapper: Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 293 diff changeset	69 @staticmethod
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	70 def open_tmp_file(pool): # pragma: no cover
46 f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	71 (fd, fn) = tempfile.mkstemp()
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	72 os.close(fd)
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	73 return fn
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	74
298 32d3f1716e66 Two minor optimisations/cleanups for svn_swig_wrapper: Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 293 diff changeset	75 @staticmethod
32d3f1716e66 Two minor optimisations/cleanups for svn_swig_wrapper: Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 293 diff changeset	76 def get_client_string(pool):
45 ce00e6ffaa90 Change the implementation of the ra_session stuff. Thanks to Ben Collins-Sussman for pointing out the problem with the other method I was using. Augie Fackler <durin42@gmail.com> parents: 36 diff changeset	77 return 'hgsubversion'
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	78
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	79 def ieditor(fn):
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	80 """Helps identify methods used by the SVN editor interface.
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	81
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	82 Stash any exception raised in the method on self.
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	83
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	84 This is required because the SWIG bindings just mutate any exception into
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	85 a generic Subversion exception with no way of telling what the original was.
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	86 This allows the editor object to notice when you try and commit and really
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	87 got an exception in the replay process.
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	88 """
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	89 def fun(self, args, *kwargs):
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	90 try:
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	91 return fn(self, args, *kwargs)
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	92 except: # pragma: no cover
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	93 if self.current.exception is not None:
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	94 self.current.exception = sys.exc_info()
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	95 raise
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	96 return fun
32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 672 diff changeset	97
965 b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	98 _prompt = None
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	99 def prompt_callback(callback):
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	100 global _prompt
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	101 _prompt = callback
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	102
966 7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	103 def _simple(realm, default_username, ms, pool):
7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	104 ret = _prompt.simple(realm, default_username, ms, pool)
7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	105 creds = core.svn_auth_cred_simple_t()
7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	106 (creds.username, creds.password, creds.may_save) = ret
7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	107 return creds
7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	108
967 0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	109 def _username(realm, ms, pool):
0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	110 ret = _prompt.username(realm, ms, pool)
0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	111 creds = core.svn_auth_cred_username_t()
0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	112 (creds.username, creds.may_save) = ret
0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	113 return creds
0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	114
968 c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	115 def _ssl_client_cert(realm, may_save, pool):
c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	116 ret = _prompt.ssl_client_cert(realm, may_save, pool)
c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	117 creds = core.svn_auth_cred_ssl_client_cert_t()
c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	118 (creds.cert_file, creds.may_save) = ret
c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	119 return creds
c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	120
969 145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	121 def _ssl_client_cert_pw(realm, may_save, pool):
145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	122 ret = _prompt.ssl_client_cert_pw(realm, may_save, pool)
145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	123 creds = core.svn_auth_cred_ssl_client_cert_pw_t()
145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	124 (creds.password, creds.may_save) = ret
145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	125 return creds
145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	126
965 b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	127 def _ssl_server_trust(realm, failures, cert_info, may_save, pool):
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	128 cert = [
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	129 cert_info.hostname,
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	130 cert_info.fingerprint,
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	131 cert_info.valid_from,
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	132 cert_info.valid_until,
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	133 cert_info.issuer_dname,
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	134 ]
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	135 ret = _prompt.ssl_server_trust(realm, failures, cert, may_save, pool)
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	136 if ret:
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	137 creds = core.svn_auth_cred_ssl_server_trust_t()
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	138 (creds.accepted_failures, creds.may_save) = ret
964 27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	139 else:
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	140 creds = None
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	141 return creds
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	142
844 95d040755254 Added ability to configure the password stores Jerome M. BERGER <jerome.berger@sagemcom.com> parents: 837 diff changeset	143 def _create_auth_baton(pool, password_stores):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	144 """Create a Subversion authentication baton. """
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	145 # Give the client context baton a suite of authentication
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	146 # providers.h
92 7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	147 platform_specific = ['svn_auth_get_gnome_keyring_simple_provider',
272 25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	148 'svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider',
92 7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	149 'svn_auth_get_keychain_simple_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	150 'svn_auth_get_keychain_ssl_client_cert_pw_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	151 'svn_auth_get_kwallet_simple_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	152 'svn_auth_get_kwallet_ssl_client_cert_pw_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	153 'svn_auth_get_ssl_client_cert_file_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	154 'svn_auth_get_windows_simple_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	155 'svn_auth_get_windows_ssl_server_trust_provider',
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	156 ]
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	157
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	158 providers = []
272 25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	159 # Platform-dependant authentication methods
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	160 getprovider = getattr(core, 'svn_auth_get_platform_specific_provider',
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	161 None)
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	162 if getprovider:
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	163 # Available in svn >= 1.6
844 95d040755254 Added ability to configure the password stores Jerome M. BERGER <jerome.berger@sagemcom.com> parents: 837 diff changeset	164 if password_stores is None:
95d040755254 Added ability to configure the password stores Jerome M. BERGER <jerome.berger@sagemcom.com> parents: 837 diff changeset	165 password_stores = ('gnome_keyring', 'keychain', 'kwallet', 'windows')
95d040755254 Added ability to configure the password stores Jerome M. BERGER <jerome.berger@sagemcom.com> parents: 837 diff changeset	166 for name in password_stores:
272 25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	167 for type in ('simple', 'ssl_client_cert_pw', 'ssl_server_trust'):
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	168 p = getprovider(name, type, pool)
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	169 if p:
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	170 providers.append(p)
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	171 else:
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	172 for p in platform_specific:
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	173 if hasattr(core, p):
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	174 try:
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	175 providers.append(getattr(core, p)())
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	176 except RuntimeError:
25d843281127 Use svn 1.6 platform specific auth providers if available Patrick Mezard <pmezard@gmail.com> parents: 266 diff changeset	177 pass
92 7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	178
7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	179 providers += [
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	180 client.get_simple_provider(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	181 client.get_username_provider(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	182 client.get_ssl_client_cert_file_provider(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	183 client.get_ssl_client_cert_pw_file_provider(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	184 client.get_ssl_server_trust_file_provider(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	185 ]
92 7486c6f6cccc svnwrap: Fix handling of auth providers so cached credentials can work. Augie Fackler <durin42@gmail.com> parents: 89 diff changeset	186
965 b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	187 if _prompt:
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	188 providers += [
966 7561aef55a4b svnwrap: Improved handling of simple_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 965 diff changeset	189 client.get_simple_prompt_provider(_simple, 2),
967 0b6a6a7c26f3 svnwrap: Improved handling of username_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 966 diff changeset	190 client.get_username_prompt_provider(_username, 2),
968 c500bc862215 svnwrap: Implement handling of ssl_client_cert_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 967 diff changeset	191 client.get_ssl_client_cert_prompt_provider(_ssl_client_cert, 2),
969 145611306f8a svnwrap: Implement handling of ssl_client_cert_pw_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 968 diff changeset	192 client.get_ssl_client_cert_pw_prompt_provider(_ssl_client_cert_pw, 2),
965 b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	193 client.get_ssl_server_trust_prompt_provider(_ssl_server_trust),
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	194 ]
b748a0eed09a svnwrap: Refactor the svn_auth_ssl_server_trust_prompt to add other handler Mitsuhiro Koga <shiena.jp@gmail.com> parents: 964 diff changeset	195
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	196 return core.svn_auth_open(providers, pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	197
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	198 _svntypes = {
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	199 core.svn_node_dir: 'd',
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	200 core.svn_node_file: 'f',
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	201 }
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	202
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	203 class SubversionRepo(object):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	204 """Wrapper for a Subversion repository.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	205
675 31cd9f41ec09 svnwrap: improve a docstring & a comment. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 674 diff changeset	206 It uses the SWIG Python bindings, see above for requirements.
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	207 """
1330 2fb0f3c377c9 svn_swig_wrapper: add a member to store reference to meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1054 diff changeset	208 def __init__(self, url='', username='', password='', head=None,
2fb0f3c377c9 svn_swig_wrapper: add a member to store reference to meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1054 diff changeset	209 password_stores=None, meta=None):
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	210 parsed = common.parse_url(url, username, password)
235 2969a20e0eef Add support for user:pass@url repositories to be hg-like Daniel Tang <dytang@cs.purdue.edu> parents: 234 diff changeset	211 # --username and --password override URL credentials
467 3941d73c262e svnwrappers: override svn+ssh credentials with supplied ones if any Patrick Mezard <pmezard@gmail.com> parents: 392 diff changeset	212 self.username = parsed[0]
3941d73c262e svnwrappers: override svn+ssh credentials with supplied ones if any Patrick Mezard <pmezard@gmail.com> parents: 392 diff changeset	213 self.password = parsed[1]
900 abd8f2f2c58a svn_swig_wrapper: canonicalize path Bryan O'Sullivan <bryano@fb.com> parents: 844 diff changeset	214 self.svn_url = core.svn_path_canonicalize(parsed[2])
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	215 self.auth_baton_pool = core.Pool()
844 95d040755254 Added ability to configure the password stores Jerome M. BERGER <jerome.berger@sagemcom.com> parents: 837 diff changeset	216 self.auth_baton = _create_auth_baton(self.auth_baton_pool, password_stores)
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	217 # self.init_ra_and_client() assumes that a pool already exists
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	218 self.pool = core.Pool()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	219
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	220 self.init_ra_and_client()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	221 self.uuid = ra.get_uuid(self.ra, self.pool)
717 ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	222 self.svn_url = ra.get_session_url(self.ra, self.pool)
ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	223 self.root = ra.get_repos_root(self.ra, self.pool)
ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	224 assert self.svn_url.startswith(self.root)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	225 # will have a leading '/', would not if we used get_repos_root2
717 ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	226 self.subdir = self.svn_url[len(self.root):]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	227 if not self.subdir or self.subdir[-1] != '/':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	228 self.subdir += '/'
717 ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	229 # the RA interface always yields quoted paths, but the editor interface
ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	230 # expects unquoted paths
ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	231 self.subdir = urllib.unquote(self.subdir)
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	232 self.hasdiff3 = True
911 772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 905 diff changeset	233 self.autoprops_config = common.AutoPropsConfig()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	234
1330 2fb0f3c377c9 svn_swig_wrapper: add a member to store reference to meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1054 diff changeset	235 # store the svn meta object for use with branch skipping
2fb0f3c377c9 svn_swig_wrapper: add a member to store reference to meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1054 diff changeset	236 self.meta = meta
2fb0f3c377c9 svn_swig_wrapper: add a member to store reference to meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1054 diff changeset	237
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	238 def init_ra_and_client(self):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	239 """Initializes the RA and client layers, because sometimes getting
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	240 unified diffs runs the remote server out of open files.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	241 """
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	242 # while we're in here we'll recreate our pool
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	243 self.pool = core.Pool()
233 80a700398995 Fix SubversionRepo to actually use provided username Daniel Tang <dytang@cs.purdue.edu> parents: 228 diff changeset	244 if self.username:
80a700398995 Fix SubversionRepo to actually use provided username Daniel Tang <dytang@cs.purdue.edu> parents: 228 diff changeset	245 core.svn_auth_set_parameter(self.auth_baton,
80a700398995 Fix SubversionRepo to actually use provided username Daniel Tang <dytang@cs.purdue.edu> parents: 228 diff changeset	246 core.SVN_AUTH_PARAM_DEFAULT_USERNAME,
80a700398995 Fix SubversionRepo to actually use provided username Daniel Tang <dytang@cs.purdue.edu> parents: 228 diff changeset	247 self.username)
234 33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 233 diff changeset	248 if self.password:
33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 233 diff changeset	249 core.svn_auth_set_parameter(self.auth_baton,
33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 233 diff changeset	250 core.SVN_AUTH_PARAM_DEFAULT_PASSWORD,
33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 233 diff changeset	251 self.password)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	252 self.client_context = client.create_context()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	253
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	254 self.client_context.auth_baton = self.auth_baton
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	255 self.client_context.config = svn_config
45 ce00e6ffaa90 Change the implementation of the ra_session stuff. Thanks to Ben Collins-Sussman for pointing out the problem with the other method I was using. Augie Fackler <durin42@gmail.com> parents: 36 diff changeset	256 callbacks = RaCallbacks()
ce00e6ffaa90 Change the implementation of the ra_session stuff. Thanks to Ben Collins-Sussman for pointing out the problem with the other method I was using. Augie Fackler <durin42@gmail.com> parents: 36 diff changeset	257 callbacks.auth_baton = self.auth_baton
ce00e6ffaa90 Change the implementation of the ra_session stuff. Thanks to Ben Collins-Sussman for pointing out the problem with the other method I was using. Augie Fackler <durin42@gmail.com> parents: 36 diff changeset	258 self.callbacks = callbacks
293 fa26c7ef0180 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 196 diff changeset	259 try:
717 ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 675 diff changeset	260 self.ra = ra.open2(self.svn_url, callbacks,
667 e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	261 svn_config, self.pool)
e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	262 except SubversionException, e:
964 27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	263 # e.child contains a detailed error messages
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	264 msglist = []
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	265 svn_exc = e
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	266 while svn_exc:
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	267 if svn_exc.args[0]:
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	268 msglist.append(svn_exc.args[0])
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	269 svn_exc = svn_exc.child
27fec8bf9273 svnwrap: Implement handling of get_ssl_server_trust_prompt_provider Mitsuhiro Koga <shiena.jp@gmail.com> parents: 931 diff changeset	270 msg = '\n'.join(msglist)
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	271 raise common.SubversionConnectionException(msg)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	272
674 a51e50d943b2 svnwrap: use decorator syntax for properties. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 673 diff changeset	273 @property
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	274 def HEAD(self):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	275 return ra.get_latest_revnum(self.ra, self.pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	276
674 a51e50d943b2 svnwrap: use decorator syntax for properties. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 673 diff changeset	277 @property
301 79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	278 def last_changed_rev(self):
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	279 try:
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	280 holder = []
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	281 ra.get_log(self.ra, [''],
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	282 self.HEAD, 1,
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	283 1, # limit of how many log messages to load
301 79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	284 True, # don't need to know changed paths
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	285 True, # stop on copies
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	286 lambda paths, revnum, author, date, message, pool:
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	287 holder.append(revnum),
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	288 self.pool)
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	289
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	290 return holder[-1]
667 e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	291 except SubversionException, e:
301 79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	292 if e.apr_err not in [core.SVN_ERR_FS_NOT_FOUND]:
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	293 raise
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	294 else:
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	295 return self.HEAD
79440ed81011 Allow specifying a revision to stop at using the -H flag. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 300 diff changeset	296
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	297 def list_dir(self, dir, revision=None):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	298 """List the contents of a server-side directory.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	299
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	300 Returns a dict-like object with one dict key per directory entry.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	301
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	302 Args:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	303 dir: the directory to list, no leading slash
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	304 rev: the revision at which to list the directory, defaults to HEAD
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	305 """
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 491 diff changeset	306 # TODO this should just not accept leading slashes like the docstring says
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 491 diff changeset	307 if dir and dir[-1] == '/':
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	308 dir = dir[:-1]
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	309 if revision is None:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	310 revision = self.HEAD
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	311 r = ra.get_dir2(self.ra, dir, revision, core.SVN_DIRENT_KIND, self.pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	312 folders, props, junk = r
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	313 return folders
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	314
666 192a3f65837a svnwrap: remove dead code Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 664 diff changeset	315 def revisions(self, paths=None, start=0, stop=0,
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	316 chunk_size=common.chunk_size):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	317 """Load the history of this repo.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	318
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	319 This is LAZY. It returns a generator, and fetches a small number
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	320 of revisions at a time.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	321
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	322 The reason this is lazy is so that you can use the same repo object
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	323 to perform RA calls to get deltas.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	324 """
361 cfdd4ec5230a Merge fetch_history_at_paths() and revisions() in svn wrappers. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	325 if paths is None:
cfdd4ec5230a Merge fetch_history_at_paths() and revisions() in svn wrappers. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	326 paths = ['']
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	327 if not stop:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	328 stop = self.HEAD
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	329 while stop > start:
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	330 def callback(paths, revnum, author, date, message, pool):
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	331 r = common.Revision(revnum, author, message, date, paths,
2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	332 strip_path=self.subdir)
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	333 revisions.append(r)
675 31cd9f41ec09 svnwrap: improve a docstring & a comment. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 674 diff changeset	334 # we only access revisions in a FIFO manner
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	335 revisions = collections.deque()
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	336
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	337 try:
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	338 # TODO: using min(start + chunk_size, stop) may be preferable;
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	339 # ra.get_log(), even with chunk_size set, takes a while
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	340 # when converting the 65k+ rev. in LLVM.
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	341 ra.get_log(self.ra,
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	342 paths,
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 717 diff changeset	343 start + 1,
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	344 stop,
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	345 chunk_size, # limit of how many log messages to load
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	346 True, # don't need to know changed paths
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	347 True, # stop on copies
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	348 callback,
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	349 self.pool)
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	350 except core.SubversionException, e:
590 5e9ab25e0112 handle nonexistant svn repositories, fixes issue 137 Jonathan Kotta <jpkotta@gmail.com> parents: 572 diff changeset	351 if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
609 aafbf0d40dc2 svnwrap: use SubversionConnectionException instead of mercurial.util.Abort Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 607 diff changeset	352 msg = ('%s not found at revision %d!'
aafbf0d40dc2 svnwrap: use SubversionConnectionException instead of mercurial.util.Abort Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 607 diff changeset	353 % (self.subdir.rstrip('/'), stop))
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	354 raise common.SubversionConnectionException(msg)
590 5e9ab25e0112 handle nonexistant svn repositories, fixes issue 137 Jonathan Kotta <jpkotta@gmail.com> parents: 572 diff changeset	355 elif e.apr_err == core.SVN_ERR_FS_NO_SUCH_REVISION:
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	356 raise common.SubversionConnectionException(e.message)
590 5e9ab25e0112 handle nonexistant svn repositories, fixes issue 137 Jonathan Kotta <jpkotta@gmail.com> parents: 572 diff changeset	357 else:
5e9ab25e0112 handle nonexistant svn repositories, fixes issue 137 Jonathan Kotta <jpkotta@gmail.com> parents: 572 diff changeset	358 raise
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	359
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	360 while len(revisions) > 1:
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	361 yield revisions.popleft()
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	362
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	363 if len(revisions) == 0:
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	364 # exit the loop; there is no history for the path.
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	365 break
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	366 else:
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	367 r = revisions.popleft()
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	368 start = r.revnum
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	369 yield r
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 298 diff changeset	370 self.init_ra_and_client()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	371
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 81 diff changeset	372 def commit(self, paths, message, file_data, base_revision, addeddirs,
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 81 diff changeset	373 deleteddirs, properties, copies):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	374 """Commits the appropriate targets from revision in editor's store.
1054 131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	375
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	376 Return the committed revision as a common.Revision instance.
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	377 """
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	378 self.init_ra_and_client()
1054 131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	379
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	380 def commit_cb(commit_info, pool):
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	381 # disregard commit_info.post_commit_err for now
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	382 r = common.Revision(commit_info.revision, commit_info.author,
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	383 message, commit_info.date)
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	384
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	385 committedrev.append(r)
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	386
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	387 committedrev = []
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	388
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	389 editor, edit_baton = ra.get_commit_editor2(self.ra,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	390 message,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	391 commit_cb,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	392 None,
20 2953c867ca99 Minor fixes to the push command to make it more robust. Augie Fackler <durin42@gmail.com> parents: 10 diff changeset	393 False,
2953c867ca99 Minor fixes to the push command to make it more robust. Augie Fackler <durin42@gmail.com> parents: 10 diff changeset	394 self.pool)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	395 checksum = []
46 f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	396 # internal dir batons can fall out of scope and get GCed before svn is
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	397 # done with them. This prevents that (credit to gvn for the idea).
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	398 batons = [edit_baton, ]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	399 def driver_cb(parent, path, pool):
46 f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	400 if not parent:
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	401 bat = editor.open_root(edit_baton, base_revision, self.pool)
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	402 batons.append(bat)
f30cda3389c2 This appears to fix pushing over both the http and svn protocols. Augie Fackler <durin42@gmail.com> parents: 45 diff changeset	403 return bat
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 81 diff changeset	404 if path in deleteddirs:
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 81 diff changeset	405 bat = editor.delete_entry(path, base_revision, parent, pool)
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 81 diff changeset	406 batons.append(bat)
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 81 diff changeset	407 return bat
175 2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	408 if path not in file_data:
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	409 if path in addeddirs:
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	410 bat = editor.add_directory(path, parent, None, -1, pool)
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	411 else:
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	412 bat = editor.open_directory(path, parent, base_revision, pool)
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	413 batons.append(bat)
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	414 props = properties.get(path, {})
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	415 if 'svn:externals' in props:
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	416 value = props['svn:externals']
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	417 editor.change_dir_prop(bat, 'svn:externals', value, pool)
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 172 diff changeset	418 return bat
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	419 base_text, new_text, action = file_data[path]
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	420 compute_delta = True
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	421 if action == 'modify':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	422 baton = editor.open_file(path, parent, base_revision, pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	423 elif action == 'add':
266 a5f20358f737 Remove stray prints Luke Opperman <luke@loppear.com> parents: 263 diff changeset	424 frompath, fromrev = copies.get(path, (None, -1))
a5f20358f737 Remove stray prints Luke Opperman <luke@loppear.com> parents: 263 diff changeset	425 if frompath:
544 809c673bdd30 svnwrap: escape copy sources paths in commit handler Patrick Mezard <pmezard@gmail.com> parents: 543 diff changeset	426 frompath = self.path2url(frompath)
266 a5f20358f737 Remove stray prints Luke Opperman <luke@loppear.com> parents: 263 diff changeset	427 baton = editor.add_file(path, parent, frompath, fromrev, pool)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	428 elif action == 'delete':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	429 baton = editor.delete_entry(path, base_revision, parent, pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	430 compute_delta = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	431
10 dfdc078661db Auto-set executable, symlink, and auto-props. Augie Fackler <durin42@gmail.com> parents: 9 diff changeset	432 if path in properties:
dfdc078661db Auto-set executable, symlink, and auto-props. Augie Fackler <durin42@gmail.com> parents: 9 diff changeset	433 if properties[path].get('svn:special', None):
dfdc078661db Auto-set executable, symlink, and auto-props. Augie Fackler <durin42@gmail.com> parents: 9 diff changeset	434 new_text = 'link %s' % new_text
dfdc078661db Auto-set executable, symlink, and auto-props. Augie Fackler <durin42@gmail.com> parents: 9 diff changeset	435 for p, v in properties[path].iteritems():
dfdc078661db Auto-set executable, symlink, and auto-props. Augie Fackler <durin42@gmail.com> parents: 9 diff changeset	436 editor.change_file_prop(baton, p, v)
dfdc078661db Auto-set executable, symlink, and auto-props. Augie Fackler <durin42@gmail.com> parents: 9 diff changeset	437
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	438 if compute_delta:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	439 handler, wh_baton = editor.apply_textdelta(baton, None,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	440 self.pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	441
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	442 txdelta_stream = delta.svn_txdelta(
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	443 cStringIO.StringIO(base_text), cStringIO.StringIO(new_text),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	444 self.pool)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	445 delta.svn_txdelta_send_txstream(txdelta_stream, handler,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	446 wh_baton, pool)
47 9738a7c4e3dd fix svn push when there's just a file removal Valentino Volonghi aka dialtone <valentino@adroll.com> parents: 46 diff changeset	447
9738a7c4e3dd fix svn push when there's just a file removal Valentino Volonghi aka dialtone <valentino@adroll.com> parents: 46 diff changeset	448 # TODO pass md5(new_text) instead of None
9738a7c4e3dd fix svn push when there's just a file removal Valentino Volonghi aka dialtone <valentino@adroll.com> parents: 46 diff changeset	449 editor.close_file(baton, None, pool)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	450
905 04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	451 try:
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	452 delta.path_driver(editor, edit_baton, base_revision, paths, driver_cb,
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	453 self.pool)
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	454 except:
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	455 # If anything went wrong on the preceding lines, we should
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	456 # abort the in-progress transaction.
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	457 editor.abort_edit(edit_baton, self.pool)
04ded06ea517 swig bindings: abort transaction if we can't finalize it Augie Fackler <raf@durin42.com> parents: 904 diff changeset	458 raise
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	459
1011 cc774e975aed commit: fix exception handling on transaction close Matt Mackall <mpm@selenic.com> parents: 987 diff changeset	460 editor.close_edit(edit_baton, self.pool)
cc774e975aed commit: fix exception handling on transaction close Matt Mackall <mpm@selenic.com> parents: 987 diff changeset	461
1054 131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	462 return committedrev.pop()
131cb06dca76 svnwrap & pushmod: return a Revision when committing Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1036 diff changeset	463
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	464 def get_replay(self, revision, editor, oldest_rev_i_have=0):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	465 # this method has a tendency to chew through RAM if you don't re-init
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	466 self.init_ra_and_client()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	467 e_ptr, e_baton = delta.make_editor(editor)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	468 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	469 ra.replay(self.ra, revision, oldest_rev_i_have, True, e_ptr,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	470 e_baton, self.pool)
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	471 except SubversionException, e: # pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	472 # can I depend on this number being constant?
224 2165461d2dd8 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 196 diff changeset	473 if (e.apr_err == core.SVN_ERR_RA_NOT_IMPLEMENTED or
2165461d2dd8 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 196 diff changeset	474 e.apr_err == core.SVN_ERR_UNSUPPORTED_FEATURE):
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	475 msg = ('This Subversion server is older than 1.4.0, and '
2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	476 'cannot satisfy replay requests.')
2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	477 raise common.SubversionRepoCanNotReplay(msg)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	478 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	479 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	480
901 bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	481 # if we're not pulling the whole repo, svn fails to report
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	482 # file properties for files merged from subtrees outside ours
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	483 if self.svn_url != self.root:
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	484 links, execs = editor.current.symlinks, editor.current.execfiles
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	485 l = len(self.subdir) - 1
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	486 for f in editor.current.added:
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	487 sf = f[l:]
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	488 if links[f] or execs[f]:
bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	489 continue
1023 7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	490 # The list_props API creates a new connection and then
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	491 # calls get_file for the remote file case. It also
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	492 # creates a new connection to the subversion server
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	493 # every time it's called. As a result, it's actually
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	494 # cheaper to call get_file than list_props here
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	495 data, mode = self.get_file(sf, revision)
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	496 links[f] = mode == 'l'
7a262ecae4f3 svnwrap: use get_file instead of list_props during replay David Schleimer <dschleimer@fb.com> parents: 1011 diff changeset	497 execs[f] = mode == 'x'
901 bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 900 diff changeset	498
649 2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	499 def get_revision(self, revision, editor):
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	500 ''' feed the contents of the given revision to the given editor '''
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	501
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	502 e_ptr, e_baton = delta.make_editor(editor)
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	503
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	504 reporter, reporter_baton = ra.do_update(self.ra, revision, "", True,
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	505 e_ptr, e_baton)
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	506
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	507 reporter.set_path(reporter_baton, "", revision, True, None)
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	508 reporter.finish_report(reporter_baton)
2060e0ca8dd5 svnwrap: add get_revision(); a thing wrapper around ra.do_update() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	509
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	510 def get_unified_diff(self, path, revision, other_path=None, other_rev=None,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	511 deleted=True, ignore_type=False):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	512 """Gets a unidiff of path at revision against revision-1.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	513 """
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	514 if not self.hasdiff3:
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	515 raise common.SubversionRepoCanNotDiff()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	516 # works around an svn server keeping too many open files (observed
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	517 # in an svnserve from the 1.2 era)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	518 self.init_ra_and_client()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	519
491 b71507d7becc svn_swig_wrapper: minor code cleanup. Augie Fackler <durin42@gmail.com> parents: 489 diff changeset	520 url = self.path2url(path)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	521 url2 = url
491 b71507d7becc svn_swig_wrapper: minor code cleanup. Augie Fackler <durin42@gmail.com> parents: 489 diff changeset	522 url2 = (other_path and self.path2url(other_path) or url)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	523 if other_rev is None:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	524 other_rev = revision - 1
81 85dcea81f22b SubversionRepo: close files before rmtree() in diff3 Patrick Mezard <pmezard@gmail.com> parents: 77 diff changeset	525 old_cwd = os.getcwd()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	526 tmpdir = tempfile.mkdtemp('svnwrap_temp')
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	527 out, err = None, None
66 a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	528 try:
a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	529 # hot tip: the swig bridge doesn't like StringIO for these bad boys
a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	530 out_path = os.path.join(tmpdir, 'diffout')
a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	531 error_path = os.path.join(tmpdir, 'differr')
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	532 out = open(out_path, 'w')
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	533 err = open(error_path, 'w')
81 85dcea81f22b SubversionRepo: close files before rmtree() in diff3 Patrick Mezard <pmezard@gmail.com> parents: 77 diff changeset	534 try:
85dcea81f22b SubversionRepo: close files before rmtree() in diff3 Patrick Mezard <pmezard@gmail.com> parents: 77 diff changeset	535 client.diff3([], url2, optrev(other_rev), url, optrev(revision),
85dcea81f22b SubversionRepo: close files before rmtree() in diff3 Patrick Mezard <pmezard@gmail.com> parents: 77 diff changeset	536 True, True, deleted, ignore_type, 'UTF-8', out, err,
85dcea81f22b SubversionRepo: close files before rmtree() in diff3 Patrick Mezard <pmezard@gmail.com> parents: 77 diff changeset	537 self.client_context, self.pool)
667 e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	538 except SubversionException, e:
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	539 # "Can't write to stream: The handle is invalid."
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	540 # This error happens systematically under Windows, possibly
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	541 # related to file handles being non-write shareable by default.
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	542 if e.apr_err != 720006:
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	543 raise
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	544 self.hasdiff3 = False
672 2cc1342d4476 svnwrap: factor out a common module Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 668 diff changeset	545 raise common.SubversionRepoCanNotDiff()
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	546 out.close()
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	547 err.close()
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	548 out, err = None, None
66 a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	549 assert len(open(error_path).read()) == 0
a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	550 diff = open(out_path).read()
a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	551 return diff
a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	552 finally:
89 edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	553 if out: out.close()
edeec6829d80 SubversionRepo: remember svn.diff3() does not work Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	554 if err: err.close()
66 a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	555 shutil.rmtree(tmpdir)
81 85dcea81f22b SubversionRepo: close files before rmtree() in diff3 Patrick Mezard <pmezard@gmail.com> parents: 77 diff changeset	556 os.chdir(old_cwd)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	557
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	558 def get_file(self, path, revision):
76 6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	559 """Return content and mode of file at given path and revision.
6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	560
97 0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	561 "link " prefix is dropped from symlink content. Mode is 'x' if
0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	562 file is executable, 'l' if a symlink, the empty string
0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	563 otherwise. If the file does not exist at this revision, raise
0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	564 IOError.
76 6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	565 """
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 491 diff changeset	566 assert not path.startswith('/')
76 6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	567 mode = ''
66 a31968146f3c svnwrap: Fix leakage of temp dirs by using try/finally blocks. Augie Fackler <durin42@gmail.com> parents: 63 diff changeset	568 try:
931 e1dbd9646d6a svnwrap: use custom StringIO class in get_file() Patrick Mezard <patrick@mezard.eu> parents: 911 diff changeset	569 out = common.SimpleStringIO()
76 6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	570 info = ra.get_file(self.ra, path, revision, out)
122 04c92c2c4501 SubversionRepo: work around ra.get_files() not releasing input buffer Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	571 data = out.getvalue()
04c92c2c4501 SubversionRepo: work around ra.get_files() not releasing input buffer Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	572 out.close()
76 6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	573 if isinstance(info, list):
6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	574 info = info[-1]
6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	575 mode = ("svn:executable" in info) and 'x' or ''
6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	576 mode = ("svn:special" in info) and 'l' or mode
667 e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	577 except SubversionException, e:
74 450d5d9d3b80 SubversionRepo: do not use temporary file in get_file() Patrick Mezard <pmezard@gmail.com> parents: 70 diff changeset	578 notfound = (core.SVN_ERR_FS_NOT_FOUND,
450d5d9d3b80 SubversionRepo: do not use temporary file in get_file() Patrick Mezard <pmezard@gmail.com> parents: 70 diff changeset	579 core.SVN_ERR_RA_DAV_PATH_NOT_FOUND)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 511 diff changeset	580 if e.args[1] in notfound: # File not found
cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 511 diff changeset	581 raise IOError(errno.ENOENT, e.args[0])
74 450d5d9d3b80 SubversionRepo: do not use temporary file in get_file() Patrick Mezard <pmezard@gmail.com> parents: 70 diff changeset	582 raise
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 717 diff changeset	583 if mode == 'l':
97 0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	584 linkprefix = "link "
0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	585 if data.startswith(linkprefix):
0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 92 diff changeset	586 data = data[len(linkprefix):]
76 6c62bd201785 SubversionRepo: make get_file() return the file mode Patrick Mezard <pmezard@gmail.com> parents: 75 diff changeset	587 return data, mode
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	588
172 84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	589 def list_props(self, path, revision):
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	590 """Return a mapping of property names to values, raise IOError if
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	591 specified path does not exist.
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	592 """
180 3f1e8a5ec9dd svn_swig_wrapper: hacky workaround to prevent running out of files in stupid Augie Fackler <durin42@gmail.com> parents: 175 diff changeset	593 self.init_ra_and_client()
75 cca31b6b1318 SubversionRepo: add optrev() to help generate client API revisions Patrick Mezard <pmezard@gmail.com> parents: 74 diff changeset	594 rev = optrev(revision)
489 cd793ca555af svnwrap: properly escape URLs before giving them to libsvn_* Chema Cortes <pych3m4@gmail.com> parents: 467 diff changeset	595 rpath = self.path2url(path)
172 84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	596 try:
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	597 pl = client.proplist2(rpath, rev, rev, False,
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	598 self.client_context, self.pool)
667 e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	599 except SubversionException, e:
172 84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	600 # Specified path does not exist at this revision
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	601 if e.apr_err == core.SVN_ERR_NODE_UNKNOWN_KIND:
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 511 diff changeset	602 raise IOError(errno.ENOENT, e.args[0])
172 84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	603 raise
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	604 if not pl:
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	605 return {}
84fbf1469a31 SubversionRepo: simplify and rename proplist() into list_prop() Patrick Mezard <pmezard@gmail.com> parents: 155 diff changeset	606 return pl[0][1]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	607
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	608 def list_files(self, dirpath, revision):
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	609 """List the content of a directory at a given revision, recursively.
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	610
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	611 Yield tuples (path, kind) where 'path' is the entry path relatively to
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	612 'dirpath' and 'kind' is 'f' if the entry is a file, 'd' if it is a
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	613 directory. Raise IOError if the directory cannot be found at given
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	614 revision.
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	615 """
489 cd793ca555af svnwrap: properly escape URLs before giving them to libsvn_* Chema Cortes <pych3m4@gmail.com> parents: 467 diff changeset	616 rpath = self.path2url(dirpath)
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	617 pool = core.Pool()
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	618 rev = optrev(revision)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	619 try:
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	620 entries = client.ls(rpath, rev, True, self.client_context, pool)
667 e872f549e42f svnwrap: s/core.SubversionException/SubversionException/ Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 666 diff changeset	621 except SubversionException, e:
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	622 if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 511 diff changeset	623 raise IOError(errno.ENOENT,
cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 511 diff changeset	624 '%s cannot be found at r%d' % (dirpath, revision))
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	625 raise
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	626 for path, e in entries.iteritems():
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	627 kind = _svntypes.get(e.kind)
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	628 yield path, kind
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	629
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	630 def checkpath(self, path, revision):
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	631 """Return the entry type at the given revision, 'f', 'd' or None
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	632 if the entry does not exist.
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	633 """
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	634 kind = ra.check_path(self.ra, path.strip('/'), revision)
b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	635 return _svntypes.get(kind)
489 cd793ca555af svnwrap: properly escape URLs before giving them to libsvn_* Chema Cortes <pych3m4@gmail.com> parents: 467 diff changeset	636
491 b71507d7becc svn_swig_wrapper: minor code cleanup. Augie Fackler <durin42@gmail.com> parents: 489 diff changeset	637 def path2url(self, path):
b71507d7becc svn_swig_wrapper: minor code cleanup. Augie Fackler <durin42@gmail.com> parents: 489 diff changeset	638 """Build svn URL for path, URL-escaping path.
489 cd793ca555af svnwrap: properly escape URLs before giving them to libsvn_* Chema Cortes <pych3m4@gmail.com> parents: 467 diff changeset	639 """
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 491 diff changeset	640 if not path or path == '.':
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 491 diff changeset	641 return self.svn_url
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 491 diff changeset	642 assert path[0] != '/', path
904 b6b1365e3489 canonicalize svn paths even more awesomely Bryan O'Sullivan <bryano@fb.com> parents: 901 diff changeset	643 path = path.rstrip('/')
b6b1365e3489 canonicalize svn paths even more awesomely Bryan O'Sullivan <bryano@fb.com> parents: 901 diff changeset	644 try:
b6b1365e3489 canonicalize svn paths even more awesomely Bryan O'Sullivan <bryano@fb.com> parents: 901 diff changeset	645 # new in svn 1.7
b6b1365e3489 canonicalize svn paths even more awesomely Bryan O'Sullivan <bryano@fb.com> parents: 901 diff changeset	646 return core.svn_uri_canonicalize(self.svn_url + '/' + path)
b6b1365e3489 canonicalize svn paths even more awesomely Bryan O'Sullivan <bryano@fb.com> parents: 901 diff changeset	647 except AttributeError:
b6b1365e3489 canonicalize svn paths even more awesomely Bryan O'Sullivan <bryano@fb.com> parents: 901 diff changeset	648 return self.svn_url + '/' + urllib.quote(path)

Mercurial > hgsubversion

annotate hgsubversion/svnwrap/svn_swig_wrapper.py @ 1330:2fb0f3c377c9