Bug 1444999 - Wrap hg commit in try...except #55
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stasm
reviewed
Mar 15, 2018
tools/migrate/migrate-l10n.py
Outdated
| b(message), user=b(author), addremove=True | ||
| ) | ||
| except hglib.error.CommandError as err: | ||
| print(' WARNING: hg commit failed ({})'.format(err)) |
Contributor
There was a problem hiding this comment.
In case of Mercurial errors, I think it would make sense to actually interrupt the migration. Should we check if there's anything to commit before we even print Committing changeset in line 85?
Contributor
Author
There was a problem hiding this comment.
So far I've only found a case where this happens, and that's me playing with the local files.
Unless there are other use cases, I'm not sure we should interrupt it? The print should likely be move after the commit
The output currently looks something like this:
Running migration bug_1435912_preferences_general_xul for it
Writing to /Users/flodolo/mozilla/mercurial/l10n_clones/locales/it/browser/browser/preferences/preferences.ftl
Committing changeset: Bug 1435912 - Migrate Preferences::General XUL to Fluent, part 1.
WARNING: hg commit failed ((1, 'invalid branchheads cache (served): tip differs\nnothing changed', ''))
Contributor
There was a problem hiding this comment.
OK, fair enough :) Can you change the indentation of the warning as follows?
Committing changeset: Bug 1435912 - Migrate Preferences::General XUL to Fluent, part 1.
WARNING: hg commit failed…
stasm
approved these changes
Mar 15, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.