Upstream version 1.8.2

15 files changed, 45 insertions, 29 deletions

diff --git a/.hg_archival.txt b/.hg_archival.txt
index 7c115fd..3abf145 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,4 +1,4 @@
 repo: f2636cfed11500fdc47d1e3822d8e4a2bd636bf7
-node: dde1ade36a49d3d0e1b4b8bd384a6797665b5081
+node: 38be7a6b6def3298fe9ffff141eb58e1370a53cc
 branch: stable
-tag: 1.8.1
+tag: 1.8.2
diff --git a/.hgtags b/.hgtags
index 7547194..d2d90c1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -15,3 +15,4 @@ d0f3a5c2cb56ce65d9ef1c611c8bfbebdc3bef34 1.5.1
 46523cdfd3b0cee0bf1366ab587686bb65211747 1.6.3
 139a44a63090b2c0f8e05d7d1104d3d9c9e26f57 1.7
 c1756971f8828a59c859513f208c6d79bf34c275 1.8
+dde1ade36a49d3d0e1b4b8bd384a6797665b5081 1.8.1
diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py
index e20cebf..32b41ff 100644
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
@@ -178,6 +178,9 @@ def reposetup(ui, repo):
 
     if ui.configbool('hgsubversion', 'nativerevs'):
         extensions.wrapfunction(revset, 'stringset', util.revset_stringset)
+        revset.symbols['stringset'] = revset.stringset
+        revset.methods['string'] = revset.stringset
+        revset.methods['symbol'] = revset.stringset
 
 _old_local = hg.schemes['file']
 def _lookup(url):
diff --git a/hgsubversion/util.py b/hgsubversion/util.py
index 6d1e73b..b833662 100644
--- a/hgsubversion/util.py
+++ b/hgsubversion/util.py
@@ -227,6 +227,9 @@ class PrefixMatch(object):
     def anypats(self):
         return True
 
+    def prefix(self):
+        return False
+
 def outgoing_revisions(repo, reverse_map, sourcerev):
     """Given a repo and an hg_editor, determines outgoing revisions for the
     current working copy state.
diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
index b9f2c1f..68265ca 100644
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -515,7 +515,8 @@ def pull(repo, source, heads=[], force=False, meta=None):
     else:
         ui.status("pulled %d revisions\n" % revisions)
 
-def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()):
+def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(),
+                 opargs=None):
     capable = getattr(remote, 'capable', lambda x: False)
     if capable('subversion'):
         # transaction manager is present in Mercurial >= 3.3
@@ -536,7 +537,13 @@ def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()):
             else:
                 pullop.releasetransaction()
     else:
-        return orig(repo, remote, heads, force, bookmarks=bookmarks)
+        if opargs is not None:
+            # hg 3.5
+            return orig(
+                repo, remote, heads, force, bookmarks=bookmarks, opargs=opargs)
+        else:
+            # hg 3.4
+            return orig(repo, remote, heads, force, bookmarks=bookmarks)
 
 def rebase(orig, ui, repo, **opts):
     """rebase current unpushed revisions onto the Subversion head
diff --git a/tests/comprehensive/test_custom_layout.py b/tests/comprehensive/test_custom_layout.py
index 7f6d573..c3b39e5 100644
--- a/tests/comprehensive/test_custom_layout.py
+++ b/tests/comprehensive/test_custom_layout.py
@@ -31,17 +31,14 @@ def _do_case(self, name, stupid):
     checkout_path = repo_path
     if subdir:
         checkout_path += '/' + subdir
-    u = ui.ui()
-    if stupid:
-        u.setconfig('hgsubversion', 'stupid', '1')
-    u.setconfig('hgsubversion', 'layout', 'custom')
+    u = test_util.testui(stupid=stupid, layout='custom')
     for branch, path in test_util.custom.get(name, {}).iteritems():
         u.setconfig('hgsubversionbranch', branch, path)
     test_util.hgclone(u,
                       test_util.fileurl(checkout_path),
                       wc2_path,
                       update=False)
-    self.repo2 = hg.repository(ui.ui(), wc2_path)
+    self.repo2 = hg.repository(test_util.testui(), wc2_path)
     self.assertEqual(self.repo.heads(), self.repo2.heads())
 
 
diff --git a/tests/comprehensive/test_rebuildmeta.py b/tests/comprehensive/test_rebuildmeta.py
index 5f56836..e4e486b 100644
--- a/tests/comprehensive/test_rebuildmeta.py
+++ b/tests/comprehensive/test_rebuildmeta.py
@@ -36,7 +36,7 @@ expect_youngest_skew = [('file_mixed_with_branches.svndump', False, False),
 def _do_case(self, name, layout):
     subdir = test_util.subdir.get(name, '')
     single = layout == 'single'
-    u = ui.ui()
+    u = test_util.testui()
     config = {}
     if layout == 'custom':
         for branch, path in test_util.custom.get(name, {}).iteritems():
diff --git a/tests/comprehensive/test_stupid_pull.py b/tests/comprehensive/test_stupid_pull.py
index 4abbe29..f0ee666 100644
--- a/tests/comprehensive/test_stupid_pull.py
+++ b/tests/comprehensive/test_stupid_pull.py
@@ -19,7 +19,7 @@ from hgsubversion import wrappers
 def _do_case(self, name, layout):
     subdir = test_util.subdir.get(name, '')
     config = {}
-    u = ui.ui()
+    u = test_util.testui()
     for branch, path in test_util.custom.get(name, {}).iteritems():
         config['hgsubversionbranch.%s' % branch] = path
         u.setconfig('hgsubversionbranch', branch, path)
@@ -38,7 +38,7 @@ def _do_case(self, name, layout):
     test_util.hgclone(u, test_util.fileurl(checkout_path), wc2_path, update=False)
     if layout == 'single':
         self.assertEqual(len(self.repo.heads()), 1)
-    self.repo2 = hg.repository(ui.ui(), wc2_path)
+    self.repo2 = hg.repository(test_util.testui(), wc2_path)
     self.assertEqual(self.repo.heads(), self.repo2.heads())
 
 
diff --git a/tests/comprehensive/test_updatemeta.py b/tests/comprehensive/test_updatemeta.py
index e656870..2630631 100644
--- a/tests/comprehensive/test_updatemeta.py
+++ b/tests/comprehensive/test_updatemeta.py
@@ -26,7 +26,7 @@ from hgsubversion import svnmeta
 def _do_case(self, name, layout):
     subdir = test_util.subdir.get(name, '')
     single = layout == 'single'
-    u = ui.ui()
+    u = test_util.testui()
     config = {}
     if layout == 'custom':
         config['hgsubversion.layout'] = 'custom'
diff --git a/tests/comprehensive/test_verify_and_startrev.py b/tests/comprehensive/test_verify_and_startrev.py
index 4d24f05..7581df0 100644
--- a/tests/comprehensive/test_verify_and_startrev.py
+++ b/tests/comprehensive/test_verify_and_startrev.py
@@ -74,8 +74,7 @@ def _do_case(self, name, layout):
                                           rev=shallowtip.node(),
                                           stupid=False))
 
-        stupidui = ui.ui(repo.ui)
-        stupidui.config('hgsubversion', 'stupid', True)
+        stupidui = test_util.testui(stupid=True)
         self.assertEqual(verify.verify(stupidui, repo, rev=ctx.node(),
                                        stupid=True), 0)
         self.assertEqual(verify.verify(stupidui, repo, rev=ctx.node(),
diff --git a/tests/test_diff.py b/tests/test_diff.py
index 6fd8b46..ca334d7 100644
--- a/tests/test_diff.py
+++ b/tests/test_diff.py
@@ -31,7 +31,7 @@ class DiffTests(test_util.TestBase):
         self.commitchanges([('foo', 'foo', 'This is missing a newline.'),
                             ('alpha', 'alpha', 'alpha\n\nadded line\n'),
                             ])
-        u = ui.ui()
+        u = test_util.testui()
         u.pushbuffer()
         wrappers.diff(lambda x, y, z: None, u, self.repo, svn=True)
         self.assertEqual(u.popbuffer(), expected_diff_output)
diff --git a/tests/test_pull.py b/tests/test_pull.py
index c49a38d..3a1a217 100644
--- a/tests/test_pull.py
+++ b/tests/test_pull.py
@@ -30,7 +30,7 @@ class TestPull(test_util.TestBase):
         self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
         commands.pull(self.repo.ui, repo)
         self.assertEqual(state, repo.parents())
-        self.assertTrue('tip' not in repo[None].tags())
+        self.assertTrue('tip' not in repo['.'].tags())
 
     def test_onerevision_doupdate(self):
         repo, repo_path = self._loadupdate('single_rev.svndump')
@@ -38,7 +38,7 @@ class TestPull(test_util.TestBase):
         self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
         commands.pull(self.repo.ui, repo, update=True)
         self.failIfEqual(state, repo.parents())
-        self.assertTrue('tip' in repo[None].tags())
+        self.assertTrue('tip' in repo['.'].tags())
 
     def test_onerevision_divergent(self):
         repo, repo_path = self._loadupdate('single_rev.svndump')
@@ -51,7 +51,7 @@ class TestPull(test_util.TestBase):
             # hg < 1.9 raised when crossing branches
             pass
         self.assertEqual(state, repo.parents())
-        self.assertTrue('tip' not in repo[None].tags())
+        self.assertTrue('tip' not in repo['.'].tags())
         self.assertEqual(len(repo.heads()), 2)
 
     def test_tag_repull_doesnt_happen(self):
diff --git a/tests/test_single_dir_push.py b/tests/test_single_dir_push.py
index 05e079d..7020896 100644
--- a/tests/test_single_dir_push.py
+++ b/tests/test_single_dir_push.py
@@ -158,7 +158,7 @@ class TestSingleDirPush(test_util.TestBase):
         self.assertTrue('foo' in test_util.svnls(repo_path, ''))
         self.assertEqual(compathacks.branchset(repo), set(['default']))
         # Have to cross to another branch head, so hg.update doesn't work
-        commands.update(ui.ui(),
+        commands.update(self.ui(),
                         self.repo,
                         self.repo.branchheads('default')[1],
                         clean=True)
@@ -171,7 +171,7 @@ class TestSingleDirPush(test_util.TestBase):
         # Tests pulling and pushing with a renamed branch
         # Based on test_push_single_dir
         repo_path = self.load_svndump('branch_from_tag.svndump')
-        cmd = ['clone', '--layout=single', '--branch=flaf']
+        cmd = ['clone', '--quiet', '--layout=single', '--branch=flaf']
         if self.stupid:
             cmd.append('--stupid')
         cmd += [test_util.fileurl(repo_path), self.wc_path]
diff --git a/tests/test_unaffected_core.py b/tests/test_unaffected_core.py
index 38e85bf..9c7eaea 100644
--- a/tests/test_unaffected_core.py
+++ b/tests/test_unaffected_core.py
@@ -11,6 +11,7 @@ from mercurial import node
 from mercurial import ui
 
 def _dispatch(ui, cmd):
+    assert '--quiet' in cmd
     try:
         req = dispatch.request(cmd, ui=ui)
         dispatch._dispatch(req)
@@ -26,7 +27,7 @@ class TestMercurialCore(test_util.TestBase):
     def test_update(self):
         ''' Test 'clone --updaterev' '''
         ui = self.ui()
-        _dispatch(ui, ['init', self.wc_path])
+        _dispatch(ui, ['init', '--quiet', self.wc_path])
         repo = self.repo
         repo.ui.setconfig('ui', 'username', 'anonymous')
 
@@ -46,8 +47,9 @@ class TestMercurialCore(test_util.TestBase):
         self.assertEqual(test_util.repolen(repo), 3)
 
         updaterev = 1
-        _dispatch(ui, ['clone', self.wc_path, self.wc_path + '2',
-                                '--updaterev=%s' % updaterev])
+        _dispatch(ui, ['clone', '--quiet',
+                       self.wc_path, self.wc_path + '2',
+                       '--updaterev=%s' % updaterev])
 
         repo2 = hg.repository(ui, self.wc_path + '2')
 
@@ -57,7 +59,7 @@ class TestMercurialCore(test_util.TestBase):
     def test_branch(self):
         ''' Test 'clone --branch' '''
         ui = self.ui()
-        _dispatch(ui, ['init', self.wc_path])
+        _dispatch(ui, ['init', '--quiet', self.wc_path])
         repo = self.repo
         repo.ui.setconfig('ui', 'username', 'anonymous')
 
@@ -80,8 +82,10 @@ class TestMercurialCore(test_util.TestBase):
         self.assertEqual(test_util.repolen(repo), 3)
 
         branch = 'B1'
-        _dispatch(ui, ['clone', self.wc_path, self.wc_path + '2',
-                                '--branch', branch])
+        _dispatch(ui, [
+            'clone', '--quiet',
+            self.wc_path, self.wc_path + '2',
+            '--branch', branch])
 
         repo2 = hg.repository(ui, self.wc_path + '2')
 
diff --git a/tests/test_util.py b/tests/test_util.py
index 7ad8833..ce4561b 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -290,6 +290,7 @@ def testui(stupid=False, layout='auto', startrev=0):
     return u
 
 def dispatch(cmd):
+    assert '--quiet' in cmd
     cmd = getattr(dispatchmod, 'request', lambda x: x)(cmd)
     return dispatchmod.dispatch(cmd)
 
@@ -513,8 +514,8 @@ class TestBase(unittest.TestCase):
             i18n._ugettext = self.oldugettext  # Mercurial >= 3.2
         except AttributeError:
             i18n.t = self.oldt
-        rmtree(self.tmpdir)
         os.chdir(self.oldwd)
+        rmtree(self.tmpdir)
         setattr(ui.ui, self.patch[0].func_name, self.patch[0])
 
         _verify_our_modules()
@@ -567,6 +568,7 @@ class TestBase(unittest.TestCase):
 
         cmd = [
             'clone',
+            '--quiet',
             '--layout=%s' % layout,
             '--startrev=%s' % startrev,
             fileurl(projectpath),
@@ -746,7 +748,7 @@ class TestBase(unittest.TestCase):
         useful when debugging comprehensive tests.
         """
         # Could be more elegant, but it works with stock hg
-        _ui = ui.ui()
+        _ui = testui()
         _ui.setconfig('extensions', 'graphlog', '')
         extensions.loadall(_ui)
         graphlog = extensions.find('graphlog')