##// END OF EJS Templates
mq: use contexts
Benoit Boissinot -
r3980:e9460fe2 default
parent child Browse files
Show More
@@ -326,11 +326,12 b' class queue:'
326 hg.clean(repo, head, wlock=wlock)
326 hg.clean(repo, head, wlock=wlock)
327 self.strip(repo, n, update=False, backup='strip', wlock=wlock)
327 self.strip(repo, n, update=False, backup='strip', wlock=wlock)
328
328
329 c = repo.changelog.read(rev)
329 ctx = repo.changectx(rev)
330 ret = hg.merge(repo, rev, wlock=wlock)
330 ret = hg.merge(repo, rev, wlock=wlock)
331 if ret:
331 if ret:
332 raise util.Abort(_("update returned %d") % ret)
332 raise util.Abort(_("update returned %d") % ret)
333 n = repo.commit(None, c[4], c[1], force=1, wlock=wlock)
333 n = repo.commit(None, ctx.description(), ctx.user(),
334 force=1, wlock=wlock)
334 if n == None:
335 if n == None:
335 raise util.Abort(_("repo commit failed"))
336 raise util.Abort(_("repo commit failed"))
336 try:
337 try:
@@ -612,15 +613,12 b' class queue:'
612 self.ui.warn("saving bundle to %s\n" % name)
613 self.ui.warn("saving bundle to %s\n" % name)
613 return changegroup.writebundle(cg, name, "HG10BZ")
614 return changegroup.writebundle(cg, name, "HG10BZ")
614
615
615 def stripall(rev, revnum):
616 def stripall(revnum):
616 cl = repo.changelog
617 mm = repo.changectx(rev).manifest()
617 c = cl.read(rev)
618 mm = repo.manifest.read(c[0])
619 seen = {}
618 seen = {}
620
619
621 for x in xrange(revnum, cl.count()):
620 for x in xrange(revnum, repo.changelog.count()):
622 c = cl.read(cl.node(x))
621 for f in repo.changectx(x).files():
623 for f in c[3]:
624 if f in seen:
622 if f in seen:
625 continue
623 continue
626 seen[f] = 1
624 seen[f] = 1
@@ -702,7 +700,7 b' class queue:'
702 chgrpfile = bundle(backupch)
700 chgrpfile = bundle(backupch)
703 chgrpfile = 'file:%s' % chgrpfile
701 chgrpfile = 'file:%s' % chgrpfile
704
702
705 stripall(rev, revnum)
703 stripall(revnum)
706
704
707 change = chlog.read(rev)
705 change = chlog.read(rev)
708 chlog.strip(revnum, revnum)
706 chlog.strip(revnum, revnum)
General Comments 0
You need to be logged in to leave comments. Login now