Attempt to look up label first before p4 changes -m1
#172
Conversation
This file contains 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
ca-johnson
reviewed
Jul 22, 2020
| if not result: | ||
| return None # Revision spec had no submitted changes | ||
| return result[0]['change'] | ||
| try: |
There was a problem hiding this comment.
Check for changelist/label with re.match("^@?\d.$") or .isdigit(). Labels cannot be purely numeric.
Avoid using exceptions for flow control
This also potentially breaks some revision specifier formats, but I am not aware of anyone using anything other than labels and specific changelists. (e.g. @my-workspace-name can sync to match your workspace)
| return None # Revision spec had no submitted changes | ||
| return result[0]['change'] | ||
| try: | ||
| label = self.perforce.run('label', ['-o', revision.replace('@','')]) |
There was a problem hiding this comment.
label = revision.lstrip('@')
labelinfo = self.perforce.run_label(['-o', label])
is more consistent with general codebase, accurate and DRY
Can also change result below to changeinfo for readability.
| return result[0]['change'] | ||
| try: | ||
| label = self.perforce.run('label', ['-o', revision.replace('@','')]) | ||
| return label[0]['Revision'].replace('@','') |
There was a problem hiding this comment.
if not labelinfo:
raise Exception('Could not detect head revision at label %s' % label)
|
Superseded by #181 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
Verification