mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03:00
Remove ignored files on gotorevisionx for hg
Other revisions can change the list of ignored files and if we don't remove them, switching to another revision can fail.
This commit is contained in:
parent
3bd2bc69d3
commit
87909fae74
1 changed files with 2 additions and 2 deletions
|
@ -1697,11 +1697,11 @@ class vcs_hg(vcs):
|
||||||
self.clone_failed = True
|
self.clone_failed = True
|
||||||
raise VCSException("Hg clone failed", p.output)
|
raise VCSException("Hg clone failed", p.output)
|
||||||
else:
|
else:
|
||||||
p = FDroidPopen(['hg', 'status', '-uS'], cwd=self.local, output=False)
|
p = FDroidPopen(['hg', 'status', '-uiS'], cwd=self.local, output=False)
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
raise VCSException("Hg status failed", p.output)
|
raise VCSException("Hg status failed", p.output)
|
||||||
for line in p.output.splitlines():
|
for line in p.output.splitlines():
|
||||||
if not line.startswith('? '):
|
if not line.startswith('? ') and not line.startswith('I '):
|
||||||
raise VCSException("Unexpected output from hg status -uS: " + line)
|
raise VCSException("Unexpected output from hg status -uS: " + line)
|
||||||
FDroidPopen(['rm', '-rf', '--', line[2:]], cwd=self.local, output=False)
|
FDroidPopen(['rm', '-rf', '--', line[2:]], cwd=self.local, output=False)
|
||||||
if not self.refreshed:
|
if not self.refreshed:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue