Mercurial > hgsubversion
comparison fetch_command.py @ 198:df4611050286
Output consolidation; decrease the ‘Fetching...’ message to debug level.
| author | Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> |
|---|---|
| date | Thu, 12 Feb 2009 15:10:42 +0100 |
| parents | 43d56e973c3c |
| children | 2e8c527f0456 |
comparison
equal
deleted
inserted
replaced
| 197:43d56e973c3c | 198:df4611050286 |
|---|---|
| 79 # got a 502? Try more than once! | 79 # got a 502? Try more than once! |
| 80 tries = 0 | 80 tries = 0 |
| 81 converted = False | 81 converted = False |
| 82 while not converted and tries < 3: | 82 while not converted and tries < 3: |
| 83 try: | 83 try: |
| 84 ui.status(util.describe_revision(r)) | 84 util.describe_revision(ui, r) |
| 85 if have_replay: | 85 if have_replay: |
| 86 try: | 86 try: |
| 87 replay_convert_rev(hg_editor, svn, r) | 87 replay_convert_rev(hg_editor, svn, r) |
| 88 except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover | 88 except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover |
| 89 ui.status('%s\n' % e.message) | 89 ui.status('%s\n' % e.message) |
| 118 def replay_convert_rev(hg_editor, svn, r): | 118 def replay_convert_rev(hg_editor, svn, r): |
| 119 hg_editor.set_current_rev(r) | 119 hg_editor.set_current_rev(r) |
| 120 svn.get_replay(r.revnum, hg_editor) | 120 svn.get_replay(r.revnum, hg_editor) |
| 121 i = 1 | 121 i = 1 |
| 122 if hg_editor.missing_plaintexts: | 122 if hg_editor.missing_plaintexts: |
| 123 hg_editor.ui.status('Fetching %s files that could not use replay.\n' % | 123 hg_editor.ui.debug('Fetching %s files that could not use replay.\n' % |
| 124 len(hg_editor.missing_plaintexts)) | 124 len(hg_editor.missing_plaintexts)) |
| 125 files_to_grab = set() | 125 files_to_grab = set() |
| 126 rootpath = svn.subdir and svn.subdir[1:] or '' | 126 rootpath = svn.subdir and svn.subdir[1:] or '' |
| 127 for p in hg_editor.missing_plaintexts: | 127 for p in hg_editor.missing_plaintexts: |
| 128 hg_editor.ui.note('.') | 128 hg_editor.ui.note('.') |
| 129 hg_editor.ui.flush() | 129 hg_editor.ui.flush() |
| 593 date, | 593 date, |
| 594 extra) | 594 extra) |
| 595 ha = hg_editor.repo.commitctx(current_ctx) | 595 ha = hg_editor.repo.commitctx(current_ctx) |
| 596 hg_editor.add_to_revmap(r.revnum, b, ha) | 596 hg_editor.add_to_revmap(r.revnum, b, ha) |
| 597 hg_editor._save_metadata() | 597 hg_editor._save_metadata() |
| 598 ui.status(util.describe_commit(ha, b)) | 598 util.describe_commit(ui, ha, b) |
| 599 # These are branches which would have an 'R' status in svn log. This means they were | 599 # These are branches which would have an 'R' status in svn log. This means they were |
| 600 # replaced by some other branch, so we need to verify they get marked as closed. | 600 # replaced by some other branch, so we need to verify they get marked as closed. |
| 601 for branch in check_deleted_branches: | 601 for branch in check_deleted_branches: |
| 602 branchedits = sorted(filter(lambda x: x[0][1] == branch and x[0][0] < r.revnum, | 602 branchedits = sorted(filter(lambda x: x[0][1] == branch and x[0][0] < r.revnum, |
| 603 hg_editor.revmap.iteritems()), reverse=True) | 603 hg_editor.revmap.iteritems()), reverse=True) |