Skip to content

Commit 9030138

Browse files
authored
Bug 1444999 - Wrap hg commit in try...except (#55)
1 parent 90984a0 commit 9030138

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

tools/migrate/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ Here's what the output should look like:
2222
Annotating /home/stas/moz/l10n-central/it
2323
Running migration examples.bug_1291693
2424
Writing to /home/stas/moz/l10n-central/it/browser/branding/official/brand.ftl
25-
Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 1
25+
Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 1
2626
Writing to /home/stas/moz/l10n-central/it/browser/menubar.ftl
2727
Writing to /home/stas/moz/l10n-central/it/browser/toolbar.ftl
2828
Writing to /home/stas/moz/l10n-central/it/browser/branding/official/brand.ftl
29-
Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 2
29+
Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 2
3030
Running migration examples.about_dialog
3131
Writing to /home/stas/moz/l10n-central/it/browser/about_dialog.ftl
32-
Committing changeset: Migrate about:dialog, part 1
32+
Committing changeset: Migrate about:dialog, part 1
3333
Running migration examples.about_downloads
3434
Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl
35-
Committing changeset: Migrate about:download in Firefox for Android, part 1
35+
Committing changeset: Migrate about:download in Firefox for Android, part 1
3636
Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl
37-
Committing changeset: Migrate about:download in Firefox for Android, part 2
37+
Committing changeset: Migrate about:download in Firefox for Android, part 2
3838
Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl
39-
Committing changeset: Migrate about:download in Firefox for Android, part 3
39+
Committing changeset: Migrate about:download in Firefox for Android, part 3

tools/migrate/migrate-l10n.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,14 @@ def main(lang, reference_dir, localization_dir, migrations, dry_run):
8282
author=author
8383
)
8484

85-
print(' Committing changeset: {}'.format(message))
85+
print(' Committing changeset: {}'.format(message))
8686
if not dry_run:
87-
client.commit(
88-
b(message), user=b(author), addremove=True
89-
)
87+
try:
88+
client.commit(
89+
b(message), user=b(author), addremove=True
90+
)
91+
except hglib.error.CommandError as err:
92+
print(' WARNING: hg commit failed ({})'.format(err))
9093

9194
if __name__ == '__main__':
9295
parser = argparse.ArgumentParser(

0 commit comments

Comments
 (0)