Bazaar

Merge lp:~mnordhoff/bzr/gc-repacking-texts-message into lp:~bzr/bzr/trunk-old

  1. gc-repacking-texts-message
  2. Merge into trunk-old
Proposed by Matt Nordhoff
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mnordhoff/bzr/gc-repacking-texts-message
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 12 lines
To merge this branch: bzr merge lp:~mnordhoff/bzr/gc-repacking-texts-message
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+8266@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Nordhoff (mnordhoff) wrote :

Trivial.

When repacking a GC/CHK/whatever repo, it mutters and updates the progress bar with "repacking N revisions", "repacking N inventories", etc., but for texts, it said "repacking N text". The difference in pluralisation bugged me, so here's a patch.

Also, the test suite passes. :D

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matt Nordhoff wrote:
> Matt Nordhoff has proposed merging lp:~mnordhoff/bzr/gc-repacking-texts-message into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> Trivial.
>
> When repacking a GC/CHK/whatever repo, it mutters and updates the progress bar with "repacking N revisions", "repacking N inventories", etc., but for texts, it said "repacking N text". The difference in pluralisation bugged me, so here's a patch.
>
> Also, the test suite passes. :D
>

 review approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpSHBYACgkQJdeBCYSNAAPRJQCgrz+13qTvfzfqzJ96d7XgHvj3
yDMAnAnUushk9LqksZTGnfNufhxNXQK9
=QDmM
-----END PGP SIGNATURE-----

review: Approve

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
2--- bzrlib/repofmt/groupcompress_repo.py 2009-07-01 10:45:13 +0000
3+++ bzrlib/repofmt/groupcompress_repo.py 2009-07-08 12:35:40 +0000
4@@ -443,7 +443,7 @@
5 # is grabbing too many keys...
6 text_keys = source_vf.keys()
7 self._copy_stream(source_vf, target_vf, text_keys,
8- 'text', self._get_progress_stream, 4)
9+ 'texts', self._get_progress_stream, 4)
10
11 def _copy_signature_texts(self):
12 source_vf, target_vf = self._build_vfs('signature', False, False)