(Arne Babenhauserheide)
2012-08-11: FIX: propagate --force to the static site creation and FIX: propagate --force to the static site creation and updatingcommand.
diff --git a/staticsite.py b/staticsite.py
--- a/staticsite.py
+++ b/staticsite.py
@@ -557,7 +557,7 @@ def parsesite(ui, repo, target, **opts):
writeforks(ui, repo, target, name)
-def addrepo(ui, repo, target, bookmarks):
+def addrepo(ui, repo, target, bookmarks, force):
"""Add the repo to the target and make sure it is up to date."""
try:
commands.init(ui, dest=target)
@@ -567,9 +567,9 @@ def addrepo(ui, repo, target, bookmarks)
ui.pushbuffer()
if bookmarks:
- commands.push(ui, repo, dest=target, bookmark=repo._bookmarks)
+ commands.push(ui, repo, dest=target, bookmark=repo._bookmarks, force=force)
else:
- commands.push(ui, repo, dest=target)
+ commands.push(ui, repo, dest=target, force=force)
ui.popbuffer()
@@ -689,7 +689,7 @@ def staticsite(ui, repo, target=None, **
# currently we need to either include all bookmarks or not, because we don’t have the remote repo when parsing the site.
# TODO: I don’t know if that is the correct way to go. Maybe always push all.
bookmark = opts["bookmark"]
- addrepo(ui, repo, target, bookmark)
+ addrepo(ui, repo, target, bookmark, force=opts["force"])
# first: just create the site.
parsesite(ui, repo, target, **opts)
if opts["upload"]: