--- a/hgext/mq.py Thu Jun 03 23:18:18 2010 -0500
+++ b/hgext/mq.py Mon Jun 07 20:03:32 2010 +0200
@@ -705,7 +705,7 @@
if not keep:
r = self.qrepo()
if r:
- r.remove(patches, True)
+ r[None].remove(patches, True)
else:
for p in patches:
os.unlink(self.join(p))
@@ -874,7 +874,7 @@
wlock = None
r = self.qrepo()
if r:
- r.add([patchfn])
+ r[None].add([patchfn])
except:
repo.rollback()
raise
@@ -1713,7 +1713,7 @@
self.series_dirty = 1
qrepo = self.qrepo()
if qrepo:
- qrepo.add(added)
+ qrepo[None].add(added)
def delete(ui, repo, *patches, **opts):
"""remove patches from queue
@@ -1832,7 +1832,7 @@
fp.close()
if not os.path.exists(r.wjoin('series')):
r.wopener('series', 'w').close()
- r.add(['.hgignore', 'series'])
+ r[None].add(['.hgignore', 'series'])
commands.add(ui, r)
return 0
@@ -2308,6 +2308,7 @@
util.rename(q.join(patch), absdest)
r = q.qrepo()
if r:
+ wctx = r[None]
wlock = r.wlock()
try:
if r.dirstate[patch] == 'a':
@@ -2315,9 +2316,9 @@
r.dirstate.add(name)
else:
if r.dirstate[name] == 'r':
- r.undelete([name])
- r.copy(patch, name)
- r.remove([patch], False)
+ wctx.undelete([name])
+ wctx.copy(patch, name)
+ wctx.remove([patch], False)
finally:
wlock.release()