# HG changeset patch # User Gregory Szorc # Date 2017-07-29 19:50:56 # Node ID 8b00c723cee13e3bb96f77bd034a584350c59c6e # Parent 075823a6161b0da78024e7f14a5d3d3865d86223 statichttprepo: implement wlock() (issue5613) statichttprepo inherits from localrepository. In doing so, it obtains default implementations of various methods, like wlock(). Before this change, tags cache writing would call repo.wlock(). This failed on statichttprepo due to localrepository's wlock() looking for an instance attribute that doesn't exist on statichttprepo (statichttprepo doesn't call localrepository.__init__). We /could/ define missing attributes until the base wlock() works. However, a statichttprepo is remote and read-only and can't be locked. The class already has a lock() that short circuits. So it makes sense to implement a short-circuited wlock() as well. That is what this patch does. LockError is expected to be raised when locking fails. The constructor takes a number of arguments that are local repository centric. Rather than rework LockError to not require them (which would not be appropriate for stable), this commit populates dummy values. I don't believe they'll ever be seen by the user, as lock failures on static http repos should be limited to well-defined (and tested) scenarios. We can and should revisit the LockError type to improve this. diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py +++ b/mercurial/statichttprepo.py @@ -182,6 +182,10 @@ class statichttprepository(localrepo.loc def peer(self): return statichttppeer(self) + def wlock(self, wait=True): + raise error.LockUnavailable(0, _('lock not available'), 'lock', + _('cannot lock static-http repository')) + def lock(self, wait=True): raise error.Abort(_('cannot lock static-http repository')) diff --git a/tests/test-static-http.t b/tests/test-static-http.t --- a/tests/test-static-http.t +++ b/tests/test-static-http.t @@ -187,12 +187,22 @@ Clone with tags and branches works Clone a specific branch works - $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 2> /dev/null - [1] + $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch + adding changesets + adding manifests + adding file changes + added 4 changesets with 4 changes to 2 files + updating to branch mybranch + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved Clone a specific tag works - $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 2> /dev/null - [1] + $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 1 files + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ killdaemons.py