mercurial-crew-with-dirclash: comparison hgext/mq.py

equal deleted inserted replaced

-:04d9b31faeca
+:9c41ae1908c7
 demandload(globals(), "os sys re struct traceback errno bz2")
 from mercurial.i18n import gettext as _
 from mercurial import ui, hg, revlog, commands, util
 versionstr = "0.45"
-repomap = {}
 commands.norepo += " qclone qversion"
 class queue:
 def __init__(self, ui, path, patchdir=None):
 if qrepo:
 qrepo.add(added)
 def delete(ui, repo, patch, **opts):
 """remove a patch from the series file"""
-q = repomap[repo]
+q = repo.mq
 q.delete(repo, patch)
 q.save_dirty()
 return 0
 def applied(ui, repo, patch=None, **opts):
 """print the patches already applied"""
-repomap[repo].qapplied(repo, patch)
+repo.mq.qapplied(repo, patch)
 return 0
 def unapplied(ui, repo, patch=None, **opts):
 """print the patches not yet applied"""
-repomap[repo].unapplied(repo, patch)
+repo.mq.unapplied(repo, patch)
 return 0
 def qimport(ui, repo, *filename, **opts):
 """import a patch"""
-q = repomap[repo]
+q = repo.mq
 q.qimport(repo, filename, patch=opts['name'],
 existing=opts['existing'], force=opts['force'])
 q.save_dirty()
 return 0
 def init(ui, repo, **opts):
 """init a new queue repository"""
-q = repomap[repo]
+q = repo.mq
 r = q.init(repo, create=opts['create_repo'])
 q.save_dirty()
 if r:
 fp = r.wopener('.hgignore', 'w')
 print >> fp, 'syntax: glob'
 ui.note(_('updating destination repo\n'))
 dr.update(dr.changelog.tip())
 def commit(ui, repo, *pats, **opts):
 """commit changes in the queue repository"""
-q = repomap[repo]
+q = repo.mq
 r = q.qrepo()
 if not r: raise util.Abort('no queue repository')
 commands.commit(r.ui, r, *pats, **opts)
 def series(ui, repo, **opts):
 """print the entire series file"""
-repomap[repo].qseries(repo, missing=opts['missing'])
+repo.mq.qseries(repo, missing=opts['missing'])
 return 0
 def top(ui, repo, **opts):
 """print the name of the current patch"""
-repomap[repo].top(repo)
+repo.mq.top(repo)
 return 0
 def next(ui, repo, **opts):
 """print the name of the next patch"""
-repomap[repo].next(repo)
+repo.mq.next(repo)
 return 0
 def prev(ui, repo, **opts):
 """print the name of the previous patch"""
-repomap[repo].prev(repo)
+repo.mq.prev(repo)
 return 0
 def new(ui, repo, patch, **opts):
 """create a new patch"""
-q = repomap[repo]
+q = repo.mq
 message=commands.logmessage(**opts)
 q.new(repo, patch, msg=message, force=opts['force'])
 q.save_dirty()
 return 0
 def refresh(ui, repo, **opts):
 """update the current patch"""
-q = repomap[repo]
+q = repo.mq
 message=commands.logmessage(**opts)
 q.refresh(repo, msg=message, short=opts['short'])
 q.save_dirty()
 return 0
 def diff(ui, repo, *files, **opts):
 """diff of the current patch"""
 # deep in the dirstate code, the walkhelper method wants a list, not a tuple
-repomap[repo].diff(repo, list(files))
+repo.mq.diff(repo, list(files))
 return 0
 def lastsavename(path):
 (dir, base) = os.path.split(path)
 names = os.listdir(dir)
 newpath = path + ".%d" % (index + 1)
 return newpath
 def push(ui, repo, patch=None, **opts):
 """push the next patch onto the stack"""
-q = repomap[repo]
+q = repo.mq
 mergeq = None
 if opts['all']:
 patch = q.series[-1]
 if opts['merge']:
 if opts['name']:
 q = queue(ui, repo.join(""), repo.join(opts['name']))
 ui.warn('using patch queue: %s\n' % q.path)
 localupdate = False
 else:
-q = repomap[repo]
+q = repo.mq
 q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all'])
 q.save_dirty()
 return 0
 def restore(ui, repo, rev, **opts):
 """restore the queue state saved by a rev"""
 rev = repo.lookup(rev)
-q = repomap[repo]
+q = repo.mq
 q.restore(repo, rev, delete=opts['delete'],
 qupdate=opts['update'])
 q.save_dirty()
 return 0
 def save(ui, repo, **opts):
 """save current queue state"""
-q = repomap[repo]
+q = repo.mq
 message=commands.logmessage(**opts)
 ret = q.save(repo, msg=message)
 if ret:
 return ret
 q.save_dirty()
 backup = 'all'
 if opts['backup']:
 backup = 'strip'
 elif opts['nobackup']:
 backup = 'none'
-repomap[repo].strip(repo, rev, backup=backup)
+repo.mq.strip(repo, rev, backup=backup)
 return 0
 def version(ui, q=None):
 """print the version number"""
 ui.write("mq version %s\n" % versionstr)
 if self.tagscache:
 return self.tagscache
 tagscache = super(self.__class__, self).tags()
-q = repomap[repo]
+q = self.mq
 if not q.applied:
 return tagscache
 mqtags = [patch.split(':') for patch in q.applied]
 mqtags.append((mqtags[-1][0], 'qtip'))
 tagscache[patch[1]] = revlog.bin(patch[0])
 return tagscache
 repo.__class__ = MqRepo
-repomap[repo] = queue(ui, repo.join(""))
+repo.mq = queue(ui, repo.join(""))
 cmdtable = {
 "qapplied": (applied, [], 'hg qapplied [PATCH]'),
 "qclone": (clone,
 [('', 'pull', None, _('use pull protocol to copy metadata')),

changeset 2724	9c41ae1908c7
parent 2723	04d9b31faeca
child 2725	9ffee4f07323