##// END OF EJS Templates
progress: mark units for translation
Martin Geisler -
r10519:f75db992 stable
parent child Browse files
Show More
@@ -1339,7 +1339,7 b' class localrepository(repo.repository):'
1339
1339
1340 if r:
1340 if r:
1341 reqcnt += 1
1341 reqcnt += 1
1342 self.ui.progress(_('searching'), reqcnt, unit='queries')
1342 self.ui.progress(_('searching'), reqcnt, unit=_('queries'))
1343 self.ui.debug("request %d: %s\n" %
1343 self.ui.debug("request %d: %s\n" %
1344 (reqcnt, " ".join(map(short, r))))
1344 (reqcnt, " ".join(map(short, r))))
1345 for p in xrange(0, len(r), 10):
1345 for p in xrange(0, len(r), 10):
@@ -1352,7 +1352,7 b' class localrepository(repo.repository):'
1352 while search:
1352 while search:
1353 newsearch = []
1353 newsearch = []
1354 reqcnt += 1
1354 reqcnt += 1
1355 self.ui.progress(_('searching'), reqcnt, unit='queries')
1355 self.ui.progress(_('searching'), reqcnt, unit=_('queries'))
1356 for n, l in zip(search, remote.between(search)):
1356 for n, l in zip(search, remote.between(search)):
1357 l.append(n[1])
1357 l.append(n[1])
1358 p = n[0]
1358 p = n[0]
@@ -1388,7 +1388,7 b' class localrepository(repo.repository):'
1388 self.ui.debug("found new changesets starting at " +
1388 self.ui.debug("found new changesets starting at " +
1389 " ".join([short(f) for f in fetch]) + "\n")
1389 " ".join([short(f) for f in fetch]) + "\n")
1390
1390
1391 self.ui.progress(_('searching'), None, unit='queries')
1391 self.ui.progress(_('searching'), None, unit=_('queries'))
1392 self.ui.debug("%d total queries\n" % reqcnt)
1392 self.ui.debug("%d total queries\n" % reqcnt)
1393
1393
1394 return base.keys(), list(fetch), heads
1394 return base.keys(), list(fetch), heads
@@ -1819,9 +1819,9 b' class localrepository(repo.repository):'
1819 cnt = 0
1819 cnt = 0
1820 for chnk in group:
1820 for chnk in group:
1821 yield chnk
1821 yield chnk
1822 self.ui.progress(_('bundle changes'), cnt, unit='chunks')
1822 self.ui.progress(_('bundle changes'), cnt, unit=_('chunks'))
1823 cnt += 1
1823 cnt += 1
1824 self.ui.progress(_('bundle changes'), None, unit='chunks')
1824 self.ui.progress(_('bundle changes'), None, unit=_('chunks'))
1825
1825
1826
1826
1827 # Figure out which manifest nodes (of the ones we think might be
1827 # Figure out which manifest nodes (of the ones we think might be
@@ -1847,9 +1847,9 b' class localrepository(repo.repository):'
1847 cnt = 0
1847 cnt = 0
1848 for chnk in group:
1848 for chnk in group:
1849 yield chnk
1849 yield chnk
1850 self.ui.progress(_('bundle manifests'), cnt, unit='chunks')
1850 self.ui.progress(_('bundle manifests'), cnt, unit=_('chunks'))
1851 cnt += 1
1851 cnt += 1
1852 self.ui.progress(_('bundle manifests'), None, unit='chunks')
1852 self.ui.progress(_('bundle manifests'), None, unit=_('chunks'))
1853
1853
1854 # These are no longer needed, dereference and toss the memory for
1854 # These are no longer needed, dereference and toss the memory for
1855 # them.
1855 # them.
@@ -1890,7 +1890,7 b' class localrepository(repo.repository):'
1890 lookup_filenode_link_func(fname))
1890 lookup_filenode_link_func(fname))
1891 for chnk in group:
1891 for chnk in group:
1892 self.ui.progress(
1892 self.ui.progress(
1893 _('bundle files'), cnt, item=fname, unit='chunks')
1893 _('bundle files'), cnt, item=fname, unit=_('chunks'))
1894 cnt += 1
1894 cnt += 1
1895 yield chnk
1895 yield chnk
1896 if fname in msng_filenode_set:
1896 if fname in msng_filenode_set:
@@ -1898,7 +1898,7 b' class localrepository(repo.repository):'
1898 del msng_filenode_set[fname]
1898 del msng_filenode_set[fname]
1899 # Signal that no more groups are left.
1899 # Signal that no more groups are left.
1900 yield changegroup.closechunk()
1900 yield changegroup.closechunk()
1901 self.ui.progress(_('bundle files'), None, unit='chunks')
1901 self.ui.progress(_('bundle files'), None, unit=_('chunks'))
1902
1902
1903 if msng_cl_lst:
1903 if msng_cl_lst:
1904 self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source)
1904 self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source)
@@ -1947,19 +1947,19 b' class localrepository(repo.repository):'
1947
1947
1948 cnt = 0
1948 cnt = 0
1949 for chnk in cl.group(nodes, identity, collect):
1949 for chnk in cl.group(nodes, identity, collect):
1950 self.ui.progress(_('bundle changes'), cnt, unit='chunks')
1950 self.ui.progress(_('bundle changes'), cnt, unit=_('chunks'))
1951 cnt += 1
1951 cnt += 1
1952 yield chnk
1952 yield chnk
1953 self.ui.progress(_('bundle changes'), None, unit='chunks')
1953 self.ui.progress(_('bundle changes'), None, unit=_('chunks'))
1954
1954
1955 mnfst = self.manifest
1955 mnfst = self.manifest
1956 nodeiter = gennodelst(mnfst)
1956 nodeiter = gennodelst(mnfst)
1957 cnt = 0
1957 cnt = 0
1958 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
1958 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
1959 self.ui.progress(_('bundle manifests'), cnt, unit='chunks')
1959 self.ui.progress(_('bundle manifests'), cnt, unit=_('chunks'))
1960 cnt += 1
1960 cnt += 1
1961 yield chnk
1961 yield chnk
1962 self.ui.progress(_('bundle manifests'), None, unit='chunks')
1962 self.ui.progress(_('bundle manifests'), None, unit=_('chunks'))
1963
1963
1964 cnt = 0
1964 cnt = 0
1965 for fname in sorted(changedfiles):
1965 for fname in sorted(changedfiles):
@@ -1974,10 +1974,10 b' class localrepository(repo.repository):'
1974 lookup = lookuprevlink_func(filerevlog)
1974 lookup = lookuprevlink_func(filerevlog)
1975 for chnk in filerevlog.group(nodeiter, lookup):
1975 for chnk in filerevlog.group(nodeiter, lookup):
1976 self.ui.progress(
1976 self.ui.progress(
1977 _('bundle files'), cnt, item=fname, unit='chunks')
1977 _('bundle files'), cnt, item=fname, unit=_('chunks'))
1978 cnt += 1
1978 cnt += 1
1979 yield chnk
1979 yield chnk
1980 self.ui.progress(_('bundle files'), None, unit='chunks')
1980 self.ui.progress(_('bundle files'), None, unit=_('chunks'))
1981
1981
1982 yield changegroup.closechunk()
1982 yield changegroup.closechunk()
1983
1983
@@ -2026,7 +2026,7 b' class localrepository(repo.repository):'
2026 count = 1
2026 count = 1
2027 ui = self.ui
2027 ui = self.ui
2028 def __call__(self):
2028 def __call__(self):
2029 self.ui.progress(self.step, self.count, unit='chunks')
2029 self.ui.progress(self.step, self.count, unit=_('chunks'))
2030 self.count += 1
2030 self.count += 1
2031 pr = prog()
2031 pr = prog()
2032 chunkiter = changegroup.chunkiter(source, progress=pr)
2032 chunkiter = changegroup.chunkiter(source, progress=pr)
General Comments 0
You need to be logged in to leave comments. Login now