diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /mercurial/similar.py | |
parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.tar.gz |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'mercurial/similar.py')
-rw-r--r-- | mercurial/similar.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mercurial/similar.py b/mercurial/similar.py index 8d4b581..b18795b 100644 --- a/mercurial/similar.py +++ b/mercurial/similar.py @@ -44,8 +44,7 @@ def _findsimilarmatches(repo, added, removed, threshold): ''' copies = {} for i, r in enumerate(removed): - repo.ui.progress(_('searching for similar files'), i, - total=len(removed)) + repo.ui.progress(_('searching for similar files'), i, total=len(removed)) # lazily load text @util.cachefunc |