# HG changeset patch
# User Mahlon E. Smith <mahlon@martini.nu>
# Date 1541017333 25200
# Node ID a788cfad4cfa4e6b061d5741e04900a90b3329ca
# Parent  18869fcfbc92ba0d18d27fc40cd897cfa68b93bb# Parent  7a1d6b228af6156e715efa8bfcd37973739c1c62
Merge 7a1d6b228af6

diff -r 7a1d6b228af6 -r a788cfad4cfa src/mercurialserver/changes.py
--- a/src/mercurialserver/changes.py	Sun Dec 14 20:30:25 2014 +0100
+++ b/src/mercurialserver/changes.py	Wed Oct 31 13:22:13 2018 -0700
@@ -3,10 +3,10 @@
 """
 
 def changes(repo, node):
-    start = repo.changectx(node).rev()
+    start = repo[node].rev()
     try:
         end = len(repo.changelog)
     except:
         end = repo.changelog.count()
     for rev in xrange(start, end):
-        yield repo.changectx(rev)
+        yield repo[rev]
diff -r 7a1d6b228af6 -r a788cfad4cfa src/mercurialserver/servelog.py
--- a/src/mercurialserver/servelog.py	Sun Dec 14 20:30:25 2014 +0100
+++ b/src/mercurialserver/servelog.py	Wed Oct 31 13:22:13 2018 -0700
@@ -33,7 +33,7 @@
         op=op,
         key=ruleset.rules.get('user'),
         ssh_connection=os.environ['SSH_CONNECTION'],))
-    with open(repo.join("mercurial-server.log"), "a+") as log:
+    with open(repo.vfs.join("mercurial-server.log"), "a+") as log:
         fcntl.flock(log.fileno(), fcntl.LOCK_EX)
         log.seek(0, os.SEEK_END)
         # YAML log file format