# HG changeset patch # User Matt Mackall # Date 1301329136 18000 # Node ID c196352d935b8703a191fc6df6c113ad211df2ec # Parent 9131724c3f4bade6216eb2c91608efa233d4a01a changegroup: fold progress meter into callbacks progress meters now start at 1 rather than 0 diff -r 9131724c3f4b -r c196352d935b contrib/shrink-revlog.py --- a/contrib/shrink-revlog.py Mon Mar 28 11:18:56 2011 -0500 +++ b/contrib/shrink-revlog.py Mon Mar 28 11:18:56 2011 -0500 @@ -102,16 +102,14 @@ ui.status(_('writing revs\n')) - count = [0] - def progress(*args): - ui.progress(_('writing'), count[0], total=len(order)) - count[0] += 1 order = [r1.node(r) for r in order] # this is a bit ugly, but it works + count = [0] def lookup(x): - progress(x) + count[0] += 1 + ui.progress(_('writing'), count[0], total=len(order)) return "%020d" % r1.linkrev(r1.rev(x)) unlookup = lambda x: int(x, 10) diff -r 9131724c3f4b -r c196352d935b mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Mar 28 11:18:56 2011 -0500 +++ b/mercurial/localrepo.py Mon Mar 28 11:18:56 2011 -0500 @@ -1531,21 +1531,18 @@ changedfiles = set() collect = changegroup.collector(cl, mfs, changedfiles) + count = [0] def clookup(x): collect(x) + count[0] += 1 + self.ui.progress(_('bundling'), count[0], unit=_('changesets')) return x # Create a changenode group generator that will call our functions # back to lookup the owning changenode and collect information. - group = cl.group(csets, clookup) - for count, chunk in enumerate(group): + for chunk in cl.group(csets, clookup): yield chunk - # revlog.group yields three entries per node, so - # dividing by 3 gives an approximation of how many - # nodes have been processed. - self.ui.progress(_('bundling'), count / 3, - unit=_('changesets')) - changecount = count / 3 + changecount = count[0] efiles = len(changedfiles) self.ui.progress(_('bundling'), None) @@ -1553,16 +1550,16 @@ # Create a generator for the manifestnodes that calls our lookup # and data collection functions back. fcollect = filenode_collector(changedfiles) + count = [0] def mlookup(x): fcollect(x) + count[0] += 1 + self.ui.progress(_('bundling'), count[0], + unit=_('manifests'), total=changecount) return mfs[x] - group = mf.group(sorted(mfs, key=mf.rev), mlookup) - for count, chunk in enumerate(group): + for chunk in mf.group(sorted(mfs, key=mf.rev), mlookup): yield chunk - # see above comment for why we divide by 3 - self.ui.progress(_('bundling'), count / 3, - unit=_('manifests'), total=changecount) self.ui.progress(_('bundling'), None) mfs.clear() @@ -1585,18 +1582,16 @@ # lookup function as we need to collect no information # from filenodes. def flookup(x): - return missingfnodes[x] - - group = filerevlog.group( - sorted(missingfnodes, key=filerevlog.rev), - flookup) - for chunk in group: # even though we print the same progress on # most loop iterations, put the progress call # here so that time estimates (if any) can be updated self.ui.progress( _('bundling'), idx, item=fname, unit=_('files'), total=efiles) + return missingfnodes[x] + + for chunk in filerevlog.group( + sorted(missingfnodes, key=filerevlog.rev), flookup): yield chunk # Signal that no more groups are left. yield changegroup.closechunk() @@ -1644,30 +1639,30 @@ mmfs = {} collect = changegroup.collector(cl, mmfs, changedfiles) + count = [0] def clookup(x): + count[0] += 1 + self.ui.progress(_('bundling'), count[0], unit=_('changesets')) collect(x) return x - for count, chunk in enumerate(cl.group(nodes, clookup)): - # revlog.group yields three entries per node, so - # dividing by 3 gives an approximation of how many - # nodes have been processed. - self.ui.progress(_('bundling'), count / 3, unit=_('changesets')) + for chunk in cl.group(nodes, clookup): yield chunk efiles = len(changedfiles) - changecount = count / 3 + changecount = count[0] self.ui.progress(_('bundling'), None) mnfst = self.manifest nodeiter = gennodelst(mnfst) mfunc = lookuplinkrev_func(mnfst) + count = [0] def mlookup(x): + count[0] += 1 + self.ui.progress(_('bundling'), count[0], + unit=_('manifests'), total=changecount) return mfunc(x) - for count, chunk in enumerate(mnfst.group(nodeiter, mlookup)): - # see above comment for why we divide by 3 - self.ui.progress(_('bundling'), count / 3, - unit=_('manifests'), total=changecount) + for chunk in mnfst.group(nodeiter, mlookup): yield chunk self.ui.progress(_('bundling'), None) @@ -1682,12 +1677,12 @@ yield fname ffunc = lookuplinkrev_func(filerevlog) def flookup(x): + self.ui.progress( + _('bundling'), idx, item=fname, + total=efiles, unit=_('files')) return ffunc(x) for chunk in filerevlog.group(nodeiter, flookup): - self.ui.progress( - _('bundling'), idx, item=fname, - total=efiles, unit=_('files')) yield chunk self.ui.progress(_('bundling'), None) diff -r 9131724c3f4b -r c196352d935b tests/test-acl.t --- a/tests/test-acl.t Mon Mar 28 11:18:56 2011 -0500 +++ b/tests/test-acl.t Mon Mar 28 11:18:56 2011 -0500 @@ -90,37 +90,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -168,37 +145,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -249,37 +203,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -339,37 +270,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -426,37 +334,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -518,37 +403,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -607,37 +469,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -701,37 +540,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -792,37 +608,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -885,37 +678,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -982,37 +752,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1082,37 +829,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1176,37 +900,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1282,37 +983,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1380,37 +1058,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1474,37 +1129,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1570,37 +1202,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 @@ -1665,37 +1274,14 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 2 changesets - bundling: 2 changesets bundling: 3 changesets - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) - bundling: 0/3 manifests (0.00%) bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 1/3 manifests (33.33%) - bundling: 2/3 manifests (66.67%) - bundling: 2/3 manifests (66.67%) bundling: 2/3 manifests (66.67%) bundling: 3/3 manifests (100.00%) bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) - bundling: foo/Bar/file.txt 0/3 files (0.00%) bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: foo/file.txt 1/3 files (33.33%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) - bundling: quux/file.py 2/3 files (66.67%) bundling: quux/file.py 2/3 files (66.67%) changesets: 1 chunks add changeset ef1ea85a6374 diff -r 9131724c3f4b -r c196352d935b tests/test-bundle.t --- a/tests/test-bundle.t Mon Mar 28 11:18:56 2011 -0500 +++ b/tests/test-bundle.t Mon Mar 28 11:18:56 2011 -0500 @@ -551,26 +551,10 @@ list of changesets: d2ae7f538514cd87c17547b0de4cea71fe1af9fb 5ece8e77363e2b5269e27c66828b72da29e4341a - bundling: 0 changesets - bundling: 0 changesets - bundling: 0 changesets - bundling: 1 changesets - bundling: 1 changesets bundling: 1 changesets bundling: 2 changesets - bundling: 0/2 manifests (0.00%) - bundling: 0/2 manifests (0.00%) - bundling: 0/2 manifests (0.00%) - bundling: 1/2 manifests (50.00%) - bundling: 1/2 manifests (50.00%) bundling: 1/2 manifests (50.00%) bundling: 2/2 manifests (100.00%) bundling: b 0/2 files (0.00%) - bundling: b 0/2 files (0.00%) - bundling: b 0/2 files (0.00%) - bundling: b 0/2 files (0.00%) - bundling: b1 1/2 files (50.00%) - bundling: b1 1/2 files (50.00%) - bundling: b1 1/2 files (50.00%) bundling: b1 1/2 files (50.00%)