From 1fbbf1734fa79dee8f36e5ed9c42bb5aa604cf16 Mon Sep 17 00:00:00 2001 From: Massimo DiPierro Date: Wed, 30 Nov 2011 22:33:55 -0600 Subject: [PATCH] fixed mercurial addremove (hg moved the funciton from cmdutil to scmutil) --- VERSION | 2 +- applications/admin/controllers/mercurial.py | 2 +- applications/admin/models/0_imports.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 433e4326..44abf30b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.3 (2011-11-30 22:23:02) dev +Version 1.99.3 (2011-11-30 22:33:54) dev diff --git a/applications/admin/controllers/mercurial.py b/applications/admin/controllers/mercurial.py index cd22786f..387d8335 100644 --- a/applications/admin/controllers/mercurial.py +++ b/applications/admin/controllers/mercurial.py @@ -45,7 +45,7 @@ def commit(): INPUT(_type='submit',_value='Commit')) if form.accepts(request.vars,session): oldid = repo[repo.lookup('.')] - cmdutil.addremove(repo) + scmutil.addremove(repo) repo.commit(text=form.vars.comment) if repo[repo.lookup('.')] == oldid: response.flash = 'no changes' diff --git a/applications/admin/models/0_imports.py b/applications/admin/models/0_imports.py index a3567914..19679ba6 100644 --- a/applications/admin/models/0_imports.py +++ b/applications/admin/models/0_imports.py @@ -12,7 +12,7 @@ import socket from textwrap import dedent try: - from mercurial import ui, hg, cmdutil + from mercurial import ui, hg, cmdutil, scmutil have_mercurial = True except ImportError: have_mercurial = False