Skip to content

Bug 1444999 - Wrap hg commit in try...except #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2018
Merged

Bug 1444999 - Wrap hg commit in try...except #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tools/migrate/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 7 additions & 4 deletions tools/migrate/migrate-l10n.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down