From 970965c1f7e349f0fd9f65cc8d7c0ed3c0ce8b04 Mon Sep 17 00:00:00 2001 From: "Francesco Lodolo [:flod]" Date: Thu, 15 Mar 2018 10:31:19 +0100 Subject: [PATCH] Bug 1444999 - Wrap hg commit in try...except --- tools/migrate/README.md | 12 ++++++------ tools/migrate/migrate-l10n.py | 11 +++++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/migrate/README.md b/tools/migrate/README.md index b92aa089..9e52cb46 100644 --- a/tools/migrate/README.md +++ b/tools/migrate/README.md @@ -22,18 +22,18 @@ Here's what the output should look like: Annotating /home/stas/moz/l10n-central/it Running migration examples.bug_1291693 Writing to /home/stas/moz/l10n-central/it/browser/branding/official/brand.ftl - Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 1 + Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 1 Writing to /home/stas/moz/l10n-central/it/browser/menubar.ftl Writing to /home/stas/moz/l10n-central/it/browser/toolbar.ftl Writing to /home/stas/moz/l10n-central/it/browser/branding/official/brand.ftl - Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 2 + Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 2 Running migration examples.about_dialog Writing to /home/stas/moz/l10n-central/it/browser/about_dialog.ftl - Committing changeset: Migrate about:dialog, part 1 + Committing changeset: Migrate about:dialog, part 1 Running migration examples.about_downloads Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl - Committing changeset: Migrate about:download in Firefox for Android, part 1 + Committing changeset: Migrate about:download in Firefox for Android, part 1 Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl - Committing changeset: Migrate about:download in Firefox for Android, part 2 + Committing changeset: Migrate about:download in Firefox for Android, part 2 Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl - Committing changeset: Migrate about:download in Firefox for Android, part 3 + Committing changeset: Migrate about:download in Firefox for Android, part 3 diff --git a/tools/migrate/migrate-l10n.py b/tools/migrate/migrate-l10n.py index 0d05cd75..42eccf82 100755 --- a/tools/migrate/migrate-l10n.py +++ b/tools/migrate/migrate-l10n.py @@ -82,11 +82,14 @@ def main(lang, reference_dir, localization_dir, migrations, dry_run): author=author ) - print(' Committing changeset: {}'.format(message)) + print(' Committing changeset: {}'.format(message)) if not dry_run: - client.commit( - b(message), user=b(author), addremove=True - ) + try: + client.commit( + b(message), user=b(author), addremove=True + ) + except hglib.error.CommandError as err: + print(' WARNING: hg commit failed ({})'.format(err)) if __name__ == '__main__': parser = argparse.ArgumentParser(