(Arne Babenhauserheide)
2011-11-23: try to check for outgoing. try to check for outgoing.
diff --git a/site.py b/site.py --- a/site.py +++ b/site.py @@ -28,6 +28,7 @@ import datetime from mercurial import cmdutil from mercurial import commands from mercurial.i18n import _ +from mercurial import hg, discovery _staticidentifier = ".statichgrepo" @@ -310,19 +311,14 @@ def addrepo(ui, repo, target): except mercurial.error.RepoError, e: # already exists pass - ui.pushbuffer() - commands.outgoing(ui, repo, target, quiet=True) - out = ui.popbuffer() - # use - # other = peer(repo, opts, dest) - # common, outheads = discovery.findcommonoutgoing(repo, other, revs, - # force=opts.get('force')) - # o = repo.changelog.findmissing(common, outheads) + other = hg.peer(repo, {}, target) + common, outheads = discovery.findcommonoutgoing(repo, other, revs, force=True) + o = repo.changelog.findmissing(common, outheads) ui.pushbuffer() commands.push(ui, repo, dest=target, bookmark=repo._bookmarks) ui.popbuffer() - return out + return o @@ -434,7 +430,7 @@ def staticsite(ui, repo, target=None, ** if not target: target = "static" print repo["."].branch() # add the hg repo to the static site - addrepo(ui, repo, target) + print addrepo(ui, repo, target) # first: just create the site. parsesite(ui, repo, target, **opts) if opts["upload"]: