dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed mercurial addremove (hg moved the funciton from cmdutil to scmutil)

Browse Source
This commit is contained in:
Massimo DiPierro
2011-11-30 22:33:55 -06:00
parent 261ae74726
commit 1fbbf1734f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.3 (2011-11-30 22:23:02) dev Version 1.99.3 (2011-11-30 22:33:54) dev
applications/admin/controllers/mercurial.py
+1 -1
View File
@@ -45,7 +45,7 @@ def commit():
INPUT(_type='submit',_value='Commit')) INPUT(_type='submit',_value='Commit'))
if form.accepts(request.vars,session): if form.accepts(request.vars,session):
oldid = repo[repo.lookup('.')] oldid = repo[repo.lookup('.')]
cmdutil.addremove(repo) scmutil.addremove(repo)
repo.commit(text=form.vars.comment) repo.commit(text=form.vars.comment)
if repo[repo.lookup('.')] == oldid: if repo[repo.lookup('.')] == oldid:
response.flash = 'no changes' response.flash = 'no changes'
applications/admin/models/0_imports.py
+1 -1
View File
@@ -12,7 +12,7 @@ import socket
from textwrap import dedent from textwrap import dedent
try: try:
from mercurial import ui, hg, cmdutil from mercurial import ui, hg, cmdutil, scmutil
have_mercurial = True have_mercurial = True
except ImportError: except ImportError:
have_mercurial = False have_mercurial = False