Skip to content
Snippets Groups Projects
Commit 8b00c723 authored by Gregory Szorc's avatar Gregory Szorc
Browse files

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.
parent 075823a6
No related branches found
No related tags found
No related merge requests found
......@@ -182,6 +182,10 @@
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'))
......
......@@ -187,8 +187,13 @@
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
......@@ -192,7 +197,12 @@
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment