mercurial-scm/hg: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:2c2d2f1354b4
+:45734b51c99b
 req.add(p)
 seen.add(n[0])
 if r:
 reqcnt += 1
-self.ui.progress('searching', reqcnt, unit='queries')
+self.ui.progress(_('searching'), reqcnt, unit='queries')
 self.ui.debug("request %d: %s\n" %
 (reqcnt, " ".join(map(short, r))))
 for p in xrange(0, len(r), 10):
 for b in remote.branches(r[p:p + 10]):
 self.ui.debug("received %s:%s\n" %
 # do binary search on the branches we found
 while search:
 newsearch = []
 reqcnt += 1
-self.ui.progress('searching', reqcnt, unit='queries')
+self.ui.progress(_('searching'), reqcnt, unit='queries')
 for n, l in zip(search, remote.between(search)):
 l.append(n[1])
 p = n[0]
 f = 1
 for i in l:
 raise util.Abort(_("repository is unrelated"))
 self.ui.debug("found new changesets starting at " +
 " ".join([short(f) for f in fetch]) + "\n")
-self.ui.progress('searching', None, unit='queries')
+self.ui.progress(_('searching'), None, unit='queries')
 self.ui.debug("%d total queries\n" % reqcnt)
 return base.keys(), list(fetch), heads
 def findoutgoing(self, remote, base=None, heads=None, force=False):
 # back to lookup the owning changenode and collect information.
 group = cl.group(msng_cl_lst, identity, collect)
 cnt = 0
 for chnk in group:
 yield chnk
-self.ui.progress('bundle changes', cnt, unit='chunks')
+self.ui.progress(_('bundle changes'), cnt, unit='chunks')
 cnt += 1
-self.ui.progress('bundle changes', None, unit='chunks')
+self.ui.progress(_('bundle changes'), None, unit='chunks')
 # Figure out which manifest nodes (of the ones we think might be
 # part of the changegroup) the recipient must know about and
 # remove them from the changegroup.
 group = mnfst.group(msng_mnfst_lst, lookup_manifest_link,
 filenode_collector(changedfiles))
 cnt = 0
 for chnk in group:
 yield chnk
-self.ui.progress('bundle manifests', cnt, unit='chunks')
+self.ui.progress(_('bundle manifests'), cnt, unit='chunks')
 cnt += 1
-self.ui.progress('bundle manifests', None, unit='chunks')
+self.ui.progress(_('bundle manifests'), None, unit='chunks')
 # These are no longer needed, dereference and toss the memory for
 # them.
 msng_mnfst_lst = None
 msng_mnfst_set.clear()
 if fname in msng_filenode_set:
 # Don't need this anymore, toss it to free memory.
 del msng_filenode_set[fname]
 # Signal that no more groups are left.
 yield changegroup.closechunk()
-self.ui.progress('bundle files', None, unit='chunks')
+self.ui.progress(_('bundle files'), None, unit='chunks')
 if msng_cl_lst:
 self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source)
 return util.chunkbuffer(gengroup())
 mmfs = {}
 collect = changegroup.collector(cl, mmfs, changedfiles)
 cnt = 0
 for chnk in cl.group(nodes, identity, collect):
-self.ui.progress('bundle changes', cnt, unit='chunks')
+self.ui.progress(_('bundle changes'), cnt, unit='chunks')
 cnt += 1
 yield chnk
-self.ui.progress('bundle changes', None, unit='chunks')
+self.ui.progress(_('bundle changes'), None, unit='chunks')
 mnfst = self.manifest
 nodeiter = gennodelst(mnfst)
 cnt = 0
 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
-self.ui.progress('bundle manifests', cnt, unit='chunks')
+self.ui.progress(_('bundle manifests'), cnt, unit='chunks')
 cnt += 1
 yield chnk
-self.ui.progress('bundle manifests', None, unit='chunks')
+self.ui.progress(_('bundle manifests'), None, unit='chunks')
 cnt = 0
 for fname in sorted(changedfiles):
 filerevlog = self.file(fname)
 if not len(filerevlog):
 trp = weakref.proxy(tr)
 # pull off the changeset group
 self.ui.status(_("adding changesets\n"))
 clstart = len(cl)
 class prog(object):
-step = 'changesets'
+step = _('changesets')
 count = 1
 ui = self.ui
 def __call__(self):
 self.ui.progress(self.step, self.count, unit='chunks')
 self.count += 1
 chunkiter = changegroup.chunkiter(source, progress=pr)
 if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
 raise util.Abort(_("received changelog group is empty"))
 clend = len(cl)
 changesets = clend - clstart
-self.ui.progress('changesets', None)
+self.ui.progress(_('changesets'), None)
 # pull off the manifest group
 self.ui.status(_("adding manifests\n"))
-pr.step = 'manifests'
+pr.step = _('manifests')
 pr.count = 1
 chunkiter = changegroup.chunkiter(source, progress=pr)
 # no need to check for empty manifest group here:
 # if the result of the merge of 1 and 2 is the same in 3 and 4,
 # no new manifest will be created and the manifest group will
 # be empty during the pull
 self.manifest.addgroup(chunkiter, revmap, trp)
-self.ui.progress('manifests', None)
+self.ui.progress(_('manifests'), None)
 needfiles = {}
 if self.ui.configbool('server', 'validate', default=False):
 # validate incoming csets have their manifests
 for cset in xrange(clstart, clend):
 n = fl.node(new)
 if n in needs:
 needs.remove(n)
 if not needs:
 del needfiles[f]
-self.ui.progress('files', None)
+self.ui.progress(_('files'), None)
 for f, needs in needfiles.iteritems():
 fl = self.file(f)
 for n in needs:
 try:

branch	stable
changeset 10496	45734b51c99b
parent 10492	0e64d814d7d0
child 10510	f77f3383c666