PORTREVISION=	1

--- README.orig	2013-08-06 21:20:15 UTC

+++ README

@@ -16,19 +16,17 @@ Installation

 ------------

 You need to have either have Subversion 1.5 (or later) installed along with

 either Subvertpy 0.7.4 (or later) or the Subversion SWIG Python bindings. You

-need Mercurial 2.0 or later.

+need Mercurial 3.7 or later.

-.. _mercurial: http://selenic.com/repo/hg

-.. _mercurial-stable: http://selenic.com/repo/hg-stable

-.. _crew: http://hg.intevation.org/mercurial/crew

-.. _crew-stable: http://hg.intevation.org/mercurial/crew-stable

+.. _mercurial: http://mercurial-scm.org/repo/hg

+.. _mercurial-stable: http://mercurial-scm.org/repo/hg-stable

 If you are unfamiliar with installing Mercurial extensions, please see

 the UsingExtensions_ page in the Mercurial wiki. Look at the example

 for specifying an absolute path near the bottom of the page. You want

 to give the path to the top level of your clone of this repository.

-.. _UsingExtensions: http://mercurial.selenic.com/wiki/UsingExtensions

+.. _UsingExtensions: http://mercurial-scm.org/wiki/UsingExtensions

 Before using hgsubversion, I *strongly* encourage you to run the

 automated tests. Just use nose_ if you have it (or ``easy_install

--- hgsubversion/__init__.py.orig	2018-11-03 03:35:02 UTC

+++ hgsubversion/__init__.py

@@ -21,12 +21,7 @@ import inspect

 import os

 from mercurial import commands

-try:

-    from mercurial import exchange

-    exchange.push  # existed in first iteration of this file

-except ImportError:

-    # We only *use* the exchange module in hg 3.2+, so this is safe

-    pass

+from mercurial import exchange

 from mercurial import error as hgerror

 from mercurial import extensions

 from mercurial import help

@@ -52,6 +47,7 @@ except (ImportError, AttributeError):

         'svn.ra',

     }

+from mercurial import discovery

 from mercurial import revset

 from mercurial import subrepo

@@ -106,26 +102,13 @@ wrapcmds = { # cmd: generic, target, fixdoc, ppopts, o

     ]),

 }

-try:

-    from mercurial import discovery

-    def findcommonoutgoing(orig, *args, **opts):

-        capable = getattr(args[1], 'capable', lambda x: False)

-        if capable('subversion'):

-            return wrappers.findcommonoutgoing(*args, **opts)

-        else:

-            return orig(*args, **opts)

-    extensions.wrapfunction(discovery, 'findcommonoutgoing', findcommonoutgoing)

-except AttributeError:

-    # only need the discovery variant of this code when we drop hg < 1.6

-    def findoutgoing(orig, *args, **opts):

-        capable = getattr(args[1], 'capable', lambda x: False)

-        if capable('subversion'):

-            return wrappers.findoutgoing(*args, **opts)

-        else:

-            return orig(*args, **opts)

-    extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)

-except ImportError:

-    pass

+def findcommonoutgoing(orig, *args, **opts):

+    capable = getattr(args[1], 'capable', lambda x: False)

+    if capable('subversion'):

+        return wrappers.findcommonoutgoing(*args, **opts)

+    else:

+        return orig(*args, **opts)

+extensions.wrapfunction(discovery, 'findcommonoutgoing', findcommonoutgoing)

 def extsetup(ui):

     """insert command wrappers for a bunch of commands"""

@@ -157,12 +140,8 @@ def extsetup(ui):

     except:

         pass

-    if not hgutil.safehasattr(localrepo.localrepository, 'push'):

-        # Mercurial >= 3.2

-        extensions.wrapfunction(exchange, 'push', wrappers.exchangepush)

-    if not hgutil.safehasattr(localrepo.localrepository, 'pull'):

-        # Mercurial >= 3.2

-        extensions.wrapfunction(exchange, 'pull', wrappers.exchangepull)

+    extensions.wrapfunction(exchange, 'push', wrappers.exchangepush)

+    extensions.wrapfunction(exchange, 'pull', wrappers.exchangepull)

     helpdir = os.path.join(os.path.dirname(__file__), 'help')

--- hgsubversion/compathacks.py.orig	2018-05-27 04:28:35 UTC

+++ hgsubversion/compathacks.py

@@ -3,18 +3,20 @@

 import errno

 import sys

-from mercurial import util

+from mercurial import ui as uimod, util

-def branchset(repo):

-    """Return the set of branches present in a repo.

+# ui.makeprogress will be dropped after hg-5.1

+if util.safehasattr(uimod.ui, 'makeprogress'):

+    def progress(ui, topic, pos, item="", unit="", total=None):

+        progress = ui.makeprogress(topic, unit, total)

+        if pos is not None:

+            progress.update(pos, item=item)

+        else:

+            progress.complete()

+else:

+    def progress(ui, topic, pos, item="", unit="", total=None):

+        ui.progress(topic, pos, item="", unit="", total=None)

-    Works around branchtags() vanishing between 2.8 and 2.9.

-    """

-    try:

-        return set(repo.branchmap())

-    except AttributeError:

-        return set(repo.branchtags())

-

 def pickle_load(f):

     import cPickle as pickle

     f.seek(0)

@@ -24,6 +26,7 @@ def makememfilectx(repo, memctx, path, data, islink, i

     """Return a memfilectx

     Works around API change by 8a0cac20a1ad (first in 4.5).

+    and also API change by 550a172a603b9e (first in 5.0)

     """

     from mercurial import context

     try:

@@ -31,8 +34,15 @@ def makememfilectx(repo, memctx, path, data, islink, i

                                   islink=islink, isexec=isexec, copied=copied,

                                   changectx=memctx)

     except TypeError:

-        return context.memfilectx(repo=repo, path=path, data=data,

-                                  islink=islink, isexec=isexec, copied=copied)

+        try:

+            return context.memfilectx(repo=repo, path=path, data=data,

+                                      islink=islink, isexec=isexec,

+                                      copied=copied)

+        except TypeError:

+            return context.memfilectx(repo=repo, changectx=memctx,

+                                      path=path, data=data,

+                                      islink=islink, isexec=isexec,

+                                      copysource=copied)

 def filectxfn_deleted(memctx, path):

     """

--- hgsubversion/replay.py.orig	2018-04-20 21:33:54 UTC

+++ hgsubversion/replay.py

@@ -140,7 +140,7 @@ def _convert_rev(ui, meta, svn, r, tbdelta, firstrun):

             tag = meta.get_path_tag(meta.remotename(branch))

             if (tag and tag not in meta.tags

                 and branch not in meta.branches

-                and branch not in compathacks.branchset(meta.repo)

+                and branch not in meta.repo.branchmap()

                 and not files):

                 continue

--- hgsubversion/stupid.py.orig	2018-04-20 21:33:54 UTC

+++ hgsubversion/stupid.py

@@ -759,7 +759,7 @@ def convert_rev(ui, meta, svn, r, tbdelta, firstrun):

             # svnmeta.committag(), we can skip the whole branch for now

             if (tag and tag not in meta.tags and

                 b not in meta.branches

-                and b not in compathacks.branchset(meta.repo)

+                and b not in meta.repo.branchmap()

                 and not files_touched):

                 continue

--- hgsubversion/svncommands.py.orig	2018-05-27 04:29:06 UTC

+++ hgsubversion/svncommands.py

@@ -108,7 +108,7 @@ def _buildmeta(ui, repo, args, partial=False, skipuuid

     # of the repository instead. During this traversal, we find all converted

     # changesets that close a branch, and store their first parent

     for ctx in util.get_contexts(repo, startrev):

-        ui.progress('prepare', ctx.rev() - startrev, total=numrevs)

+        compathacks.progress(ui, 'prepare', ctx.rev() - startrev, total=numrevs)

         convinfo = util.getsvnrev(ctx, None)

         if not convinfo:

@@ -132,11 +132,11 @@ def _buildmeta(ui, repo, args, partial=False, skipuuid

             else:

                 closed.add(parentctx.rev())

-    ui.progress('prepare', None, total=numrevs)

+    compathacks.progress(ui, 'prepare', None, total=numrevs)

     revmapbuf = []

     for ctx in util.get_contexts(repo, startrev):

-        ui.progress('rebuild', ctx.rev() - startrev, total=numrevs)

+        compathacks.progress(ui, 'rebuild', ctx.rev() - startrev, total=numrevs)

         convinfo = util.getsvnrev(ctx, None)

         if not convinfo:

@@ -267,7 +267,7 @@ def _buildmeta(ui, repo, args, partial=False, skipuuid

                                   revision)

     revmap.batchset(revmapbuf, youngest)

-    ui.progress('rebuild', None, total=numrevs)

+    compathacks.progress(ui, 'rebuild', None, total=numrevs)

     # save off branch info

     util.dump(branchinfo, meta.branch_info_file)

--- hgsubversion/svnrepo.py.orig	2018-10-26 02:54:41 UTC

+++ hgsubversion/svnrepo.py

@@ -100,19 +100,6 @@ def generate_repo_class(ui, repo):

                 self.pushkey('phases', self[hash].hex(), str(phases.draft), str(phases.public))

             return hash

-        if hgutil.safehasattr(localrepo.localrepository, 'push'):

-            # Mercurial < 3.2

-            # TODO use newbranch to allow branch creation in Subversion?

-            @remotesvn

-            def push(self, remote, force=False, revs=None, newbranch=None):

-                return wrappers.push(self, remote, force, revs)

-

-        if hgutil.safehasattr(localrepo.localrepository, 'pull'):

-            # Mercurial < 3.2

-            @remotesvn

-            def pull(self, remote, heads=[], force=False):

-                return wrappers.pull(self, remote, heads, force)

-

         @remotesvn

         def findoutgoing(self, remote, base=None, heads=None, force=False):

             return wrappers.findoutgoing(self, remote, heads, force)

--- hgsubversion/util.py.orig	2018-10-26 02:54:41 UTC

+++ hgsubversion/util.py

@@ -249,6 +249,12 @@ class PrefixMatch(object):

     def prefix(self):

         return False

+    def visitdir(self, dir):

+        return True

+

+    def visitchildrenset(self, dir):

+        return 'this'

+

 def outgoing_revisions(repo, reverse_map, sourcerev):

     """Given a repo and an hg_editor, determines outgoing revisions for the

     current working copy state.

--- hgsubversion/verify.py.orig	2018-03-24 21:03:02 UTC

+++ hgsubversion/verify.py

@@ -4,6 +4,7 @@ import posixpath

 from mercurial import error

 from mercurial import worker

+import compathacks

 import svnwrap

 import svnrepo

 import util

@@ -94,7 +95,7 @@ def verify(ui, repo, args=None, **opts):

         w = worker.worker(repo.ui, perarg, verifydata, (), tuple(svndata))

         i = 0

         for _, t in w:

-            ui.progress('verify', i, total=len(hgfiles))

+            compathacks.progress(ui, 'verify', i, total=len(hgfiles))

             i += 1

             fn, ok = t.split('\0', 2)

             if not bool(ok):

@@ -110,7 +111,7 @@ def verify(ui, repo, args=None, **opts):

                 ui.write('missing file: %s\n' % f)

             result = 1

-        ui.progress('verify', None, total=len(hgfiles))

+        compathacks.progress(ui, 'verify', None, total=len(hgfiles))

     else:

         class VerifyEditor(svnwrap.Editor):

@@ -152,7 +153,7 @@ def verify(ui, repo, args=None, **opts):

                     self.props = None

                 self.seen += 1

-                self.ui.progress('verify', self.seen, total=self.total)

+                compathacks.progress(self.ui, 'verify', self.seen, total=self.total)

             def open_file(self, path, base_revnum):

                 raise NotImplementedError()

@@ -175,19 +176,19 @@ def verify(ui, repo, args=None, **opts):

                     if 'svn:executable' in self.props:

                         if fctx.flags() != 'x':

-                            self.ui.warn('wrong flags for: %s\n' % self.file)

+                            self.ui.write('wrong flags for: %s\n' % self.file)

                             self.failed = True

                     elif 'svn:special' in self.props:

                         hgdata = 'link ' + hgdata

                         if fctx.flags() != 'l':

-                            self.ui.warn('wrong flags for: %s\n' % self.file)

+                            self.ui.write('wrong flags for: %s\n' % self.file)

                             self.failed = True

                     elif fctx.flags():

-                        self.ui.warn('wrong flags for: %s\n' % self.file)

+                        self.ui.write('wrong flags for: %s\n' % self.file)

                         self.failed = True

                     if hgdata != svndata:

-                        self.ui.warn('difference in: %s\n' % self.file)

+                        self.ui.write('difference in: %s\n' % self.file)

                         diff_file(self.file, svndata)

                         self.failed = True

@@ -211,13 +212,13 @@ def verify(ui, repo, args=None, **opts):

                 raise NotImplementedError()

             def check(self):

-                self.ui.progress('verify', None, total=self.total)

+                compathacks.progress(self.ui, 'verify', None, total=self.total)

                 for f in self.unexpected:

-                    self.ui.warn('unexpected file: %s\n' % f)

+                    self.ui.write('unexpected file: %s\n' % f)

                     self.failed = True

                 for f in self.missing:

-                    self.ui.warn('missing file: %s\n' % f)

+                    self.ui.write('missing file: %s\n' % f)

                     self.failed = True

                 return not self.failed

--- hgsubversion/wrappers.py.orig	2018-08-07 01:10:48 UTC

+++ hgsubversion/wrappers.py

@@ -27,6 +27,7 @@ except ImportError:

     logcmdutil = None

 from mercurial import scmutil

+import compathacks

 import replay

 import pushmod

 import stupid as stupidmod

@@ -502,7 +503,8 @@ def pull(repo, source, heads=[], force=False, meta=Non

                             w = hgutil.termwidth()

                         bits = (r.revnum, r.author, msg)

                         ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')

-                        ui.progress('pull', r.revnum - start, total=total)

+                        compathacks.progress(ui, 'pull', r.revnum - start,

+                                             total=total)

                         meta.save_tbdelta(tbdelta)

                         close = pullfuns[have_replay](ui, meta, svn, r, tbdelta,

@@ -539,7 +541,7 @@ def pull(repo, source, heads=[], force=False, meta=Non

             lock.release()

     finally:

         if total is not None:

-            ui.progress('pull', None, total=total)

+            compathacks.progress(ui, 'pull', None, total=total)

         util.swap_out_encoding(old_encoding)

     if lastpulled is not None:

--- tests/test_fetch_branches.py.orig	2018-05-26 21:38:24 UTC

+++ tests/test_fetch_branches.py

@@ -100,7 +100,7 @@ class TestFetchBranches(test_util.TestBase):

                           'unorderedbranch.svndump', 'NaN')

         repo = self._load_fixture_and_fetch_with_anchor(

             'unorderedbranch.svndump', '4')

-        self.assertTrue('c' not in compathacks.branchset(repo))

+        self.assertTrue('c' not in set(repo.branchmap()))

     def test_branches_weird_moves(self):

         repo = self._load_fixture_and_fetch('renamedproject.svndump',

--- tests/test_single_dir_clone.py.orig	2018-05-26 21:37:44 UTC

+++ tests/test_single_dir_clone.py

@@ -21,7 +21,7 @@ class TestSingleDirClone(test_util.TestBase):

         repo = self._load_fixture_and_fetch('branch_from_tag.svndump',

                                             layout='single',

                                             subdir='')

-        self.assertEqual(compathacks.branchset(repo),

+        self.assertEqual(set(repo.branchmap()),

                          set(['default']))

         self.assertEqual(sorted(repo['tip'].manifest().keys()),

                          ['branches/branch_from_tag/alpha',

@@ -36,7 +36,7 @@ class TestSingleDirClone(test_util.TestBase):

     def test_auto_detect_single(self):

         repo = self._load_fixture_and_fetch('branch_from_tag.svndump',

                                             layout='auto')

-        self.assertEqual(compathacks.branchset(repo),

+        self.assertEqual(set(repo.branchmap()),

                          set(['default', 'branch_from_tag']))

         oldmanifest = test_util.filtermanifest(revsymbol(repo, 'default').manifest().keys())

         # remove standard layout

@@ -45,7 +45,7 @@ class TestSingleDirClone(test_util.TestBase):

         repo = self._load_fixture_and_fetch('branch_from_tag.svndump',

                                             layout='auto',

                                             subdir='trunk')

-        self.assertEqual(compathacks.branchset(repo), set(['default', ]))

+        self.assertEqual(set(repo.branchmap()), set(['default', ]))

         self.assertEqual(revsymbol(repo, 'default').manifest().keys(), oldmanifest)

     def test_clone_subdir_is_file_prefix(self):

@@ -53,7 +53,7 @@ class TestSingleDirClone(test_util.TestBase):

         repo = self._load_fixture_and_fetch(FIXTURE,

                                             layout='single',

                                             subdir=test_util.subdir[FIXTURE])

-        self.assertEqual(compathacks.branchset(repo), set(['default']))

+        self.assertEqual(set(repo.branchmap()), set(['default']))

         self.assertEqual(repo['tip'].manifest().keys(), ['flaf.txt'])

     def test_externals_single(self):

--- tests/test_single_dir_push.py.orig	2018-05-26 21:37:44 UTC

+++ tests/test_single_dir_push.py

@@ -163,7 +163,7 @@ class TestSingleDirPush(test_util.TestBase):

         self.pushrevisions()

         repo = self.repo # repo is outdated after the rebase happens, refresh

         self.assertTrue('foo' in test_util.svnls(repo_path, ''))

-        self.assertEqual(compathacks.branchset(repo), set(['default']))

+        self.assertEqual(set(repo.branchmap()), set(['default']))

         # Have to cross to another branch head, so hg.update doesn't work

         commands.update(self.ui(),

                         self.repo,

--- tests/test_tags.py.orig	2018-11-03 00:13:42 UTC

+++ tests/test_tags.py

@@ -51,7 +51,7 @@ rename a tag

     def test_branch_from_tag(self):

         repo = self._load_fixture_and_fetch('branch_from_tag.svndump')

-        self.assert_('branch_from_tag' in compathacks.branchset(repo))

+        self.assert_('branch_from_tag' in repo.branchmap())

         self.assertEqual(repo[1], revsymbol(repo, 'tag_r3'))

         self.assertEqual(revsymbol(repo, 'branch_from_tag').parents()[0],

                          revsymbol(repo, 'copied_tag'))