Mercurial > hgsubversion
changeset 1497:0991df151799
Merge with stable.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Sun, 12 Feb 2017 16:30:28 -0500 |
| parents | 8937f19586fe (current diff) b92e00895a01 (diff) |
| children | cf82df69b794 |
| files | hgsubversion/wrappers.py tests/test_util.py |
| diffstat | 4 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs +++ b/.hgsigs @@ -1,3 +1,4 @@ 41ff2014d125cfe6eda39a79dc1c7ca9c99bf785 0 iQIcBAABAgAGBQJTY6GOAAoJELnJ3IJKpb3VrTcP/iIvysZP7BMyBW6QfAZMl9vRz06BlOgGIapNFcI2E12yC6j8oADymz2QZCtj21YyyuxIeuPLya5LQ1OoGHsZk/iW700UxUdrUzW3QbKiTfKrNXN915aRE1rYznzetgQc+xqGV4Hk7P5GarAfBcZtCVtc7/Gmo9AMkU1QbLzhwDGMLLUDt1Gsu9Vn3JugVN6O10NqxxGvU18ahVMsy+qyaJBZ5fJUKnBAmwHa3DCP5DRfDNKUaAl7xOK09gvRi6h6dPl8HPrx6tN3wkQ0QRB6kD06yrJejnQ7eM/1fxLNovZ0MZe2+bHMeXWnzGseQsrlvZSi3GWch4xSW+Tqa/pRo0qbbQ8Tq3Hj7J2Ip482nEwzEZZiWcw/1vAIraYkinGuTcw0Kq+IsKh8zBRN5jiyq3NNQYXraC93KL9/raVbssPG6KAP7LBiN0cYM51T3lL1ER1/oMJJfdX4OWn6dCRptlqfwhW9hxK/R+dbm2lOcT6EENtYp4nq5amqym0i4zx/bAJmw4mpNMEmZdAIBCgjxxb01ez1IQFzvg+/+DIr62n+YGlhsYVJTDRVAdwaLXQKnSo7gIowpsWU9WRejxaISuVr6aQbuMtbtZIjqUFSIC6UR1d9GQdkiXWv+tCP29UHqTV+81BaFAyTe6s4zc5IhEZudwdN6f1bBtYD3BN3vX9M 5cdc58c1c9a7ed24a7e206150032a9443a59c569 0 iQIcBAABAgAGBQJT25kVAAoJELnJ3IJKpb3Vxm0QAMQApF/pARrrb3k1ZholO0o4y1AU9551r3yeFRS9U6kqofqspSOKx0rrzw2RraSuMP++eznjfpbv1njM/Zd+oEFgCEHxq6lrkafxxq8oKj07IVqjaRshleBiVbr9/Hrko7W4zjhV6ROIpM2g1o6Sx8qXqRkzAB3YbDppxnI5lVOVZGnKDTcInw+eaDRX5S8clXdd+xbRBSRd+gM6VFsUrP9963S7siZU/u8Lmo5fUZdKFC5iNLPjTuhEhw7FWg4TzeAyWedvv0WFl14TJpdJRlmdwptVlR48PkjFZUhwcYZJ4LE2HUclpDmNRpR1PMrZK5FdH42vM9OQfB2c+0whDWUo0UaM1QnEc1NKj5828FmknfwrwwNrcanHl+Ig4ccmVJeDZDtZDg0TyUBPfnUVBvNFTpJqPo7MlAeQD1e5YflHSZR+CBzG8UTQssJbfiwO2o+bKVrqjHxjvsIqjdvi2Ueeh0fZw09l/zzz17I4RymwQTD+laEXQ7Xk+0VwQyYBfeR/nwYORcWDVVrATxROvG3lqKqGbU0VnzUoGF7P+bRbWEX8Y+noSKPYiqoDunIv4su9IOMBG0Y672X+ETta8ALKWKAx8cSD/kVzyLqQPWryvgUv6eG6iJpDN/uw7F23gRkKdBhOH9N9TSBCfA6ZUvTTgsDz5HLsEiOMCDQKXzv5 e7d84481cf76a1a839b4ab2ebb0a081b01658fe0 0 iQIcBAABAgAGBQJUy6pRAAoJELnJ3IJKpb3VNMkP/RwDENQbqcbT9HxmbmynPQy5s7G4jUBD35h67GKE18hNAPTCe1eO6sTlwEBNGsmFov+E/0PHr+GGb6wQDK/hetcTIFSMaQNDkTh4H1Znp/wsXr+j1nrDBPNMlrrNBNMWCMKYPsLI/XsGCBOnxiA4pa6GNOI1G424wlfsKtt9DiE8jVd0AqUENQBCCbX4QML8+aCrkjxEU6LhQbZMMqCMbeZhAlgxnQ6WiM09DTy2lJFgvZCqR1UFNmDaC+bXwL08443RIzsBmzi+XunL57wjRd4azRrUudufOe1/0Eg6UYREcoQiawU+4j6++Vo0lEJQqf3BKXCylWbviNXy02FdZv9ER725pJ2PXEa1nJ5qoO4/KWef/Rlqe0q5c1K/0FkriJRp3cltq2JBdHJEBYekiCTlqOEgPVGvLRdMiftGQwXbrI60NZ9O1SI7bq8peciljF+/CJXSjfUefCk6TpAZKLJDF2ALkFC0XlbI6LwSztGX7i+07Us8FelvBj5KWdKMkU4/n9pM1ipQdJ8x/z+J7A5MaMVUU0yTp2T8YU8QKCymybPhzJE6b6USDAn0nc37l1BZtajenJB7YCcwcypiWZY6x08vKhNNapYLf19Nkpug+NeSPGMa7x4x31Rylr3bgPmBI5FtNZWbuEP/M7iMgmsF605ZptW9UYaOzy9/sgrR +051a517b473b7bbb7f2176ed38a34fcee96fceee 0 iQIcBAABCAAGBQJYoNNkAAoJELnJ3IJKpb3VjncP/2jqEWRuxEFQs1Er3yPPi+Uj+NRRS6g7wI2VSGsgi6MVSUQcqH9BfHGciVVyzOck/m3F5RtTBNizhkqVWL7zYjoQtdUShkIDI9ac8m8pzSXJbJeZ7Lum4xzYdgJimqGlW4TC80ri8909al83yPVUKtjdF4G7h/ZhJz9aaDXsKtpSnwgXsXZilO6r18G3g8MRcWjxBnuY0+lb/vPIH01tx3QrTFQNIv1xjrV8pLF4g7e6MLsXrKVstC0PsBPs24tBXchbTbA5xuncgGIGSTep6gth6XrBEQIqZ3uenUC2uABeuK9YCujWqce/EKCKKD/im3zK9og61nR+sSkd6jitITKcWpTT4LsD7FQukpVBeAfbWE/8WHhdAICryG/3qEd3i841DANsXpsTO/BNBvRrlwVpbpw62k9aCXugPb88nt3HhNh6XPEMW4yAMpOkbmw0y6fSW9se8WbgGZntoYG3+AS0OkGKLkHVhJn5vGX4kUWL/rcbxIiTxSL3DA2gt5OcKVjQ7D7FPzZ1Ws9XQcy3/ii0qjZEUiWgRWEg1FMwV2sNz8CvXGhwh2D+8lBz5QSwN4NENcx0/2NQ5xZgIk8eb7T580dirC+N5PIHYqcxr7y6fDICMt3na0+goUyJJayAYkopAdkeGW94Xv68u6ceALuwKZSRMdJ2FCVwAEdaHAJG
--- a/.hgtags +++ b/.hgtags @@ -21,3 +21,4 @@ 759cafce6becef077fb1a152b554a05ff66b04cd 89997a5fc18163c5f65b83272b4521cdbf29984e 1.8.4 bd979667611d9df733c61251e7668899f3e77a8f 1.8.5 49d324e11856f5d65bd7f83f7ffb3a2f07bf82c1 1.8.6 +051a517b473b7bbb7f2176ed38a34fcee96fceee 1.8.7
--- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -1,3 +1,6 @@ +import inspect +import os + from hgext import rebase as hgrebase from mercurial import cmdutil @@ -19,7 +22,6 @@ from mercurial import revset from mercurial import scmutil import layouts -import os import replay import pushmod import stupid as stupidmod @@ -133,6 +135,9 @@ def findcommonoutgoing(repo, other, only common, heads = util.outgoing_common_and_heads(repo, hashes, parent) outobj = getattr(discovery, 'outgoing', None) if outobj is not None: + if 'repo' in inspect.getargspec(outobj.__init__).args: + # Mercurial 4.0 and later + return outobj(repo, common, heads) # Mercurial 2.1 and later return outobj(repo.changelog, common, heads) # Mercurial 2.0 and earlier
--- a/tests/test_util.py +++ b/tests/test_util.py @@ -293,6 +293,7 @@ def testui(stupid=False, layout='auto', u = ui.ui() bools = {True: 'true', False: 'false'} u.setconfig('ui', 'quiet', bools[True]) + u.setconfig('ui', 'username', 'automated tests') u.setconfig('extensions', 'hgsubversion', '') u.setconfig('hgsubversion', 'stupid', bools[stupid]) u.setconfig('hgsubversion', 'layout', layout)