-
-
rbtools/clients/clearcase.py (Diff revision 1) Can we do one string and one format operation? Adjacent string literals will get concatenated without using + operators (like in C). Please also change "try" to "tried".
die("Error: you tried to post changes that you cannot check-in.\n" "Merge from the LATEST version to clear this error.\n" "Offending version: %s@@%s\n" "Latest version: %s@@%s\n" % (path, previous, path, latest)) -
rbtools/clients/clearcase.py (Diff revision 1) These could be combined:
self._versions, self._arrows = self._load_vtree(path) -
rbtools/clients/clearcase.py (Diff revision 1) This should call
re.escapeon the path before formatting it into the regex.This should also prefix the string with r (`r"{0}...").
-
rbtools/clients/clearcase.py (Diff revision 1) This should prefix the string with r (
r"\s...").I also don't see any format characters in the string, so the
.format()call is useless. -
rbtools/clients/clearcase.py (Diff revision 1) Since this is called by something outside of this class, it should be called
latest_from_branch(no underscore). -
rbtools/clients/clearcase.py (Diff revision 1) This should probably call re.escape on branch, in case the branch name has regex special characters in it.
-
rbtools/clients/clearcase.py (Diff revision 1) Since this is called by something outside of this class, it should be called
merge_arrows_towards(no underscore).
ClearCase: Select latest version as base if there is a merge from it. Fail otherwise.
Review Request #5619 — Created March 13, 2014 and discarded
In ClearCase it is only possible to commit changes to the LATEST version. The new code checks for cases where the CHECKEDOUT version is not LATEST and notifies the user that a merge is needed.
The new code also makes LATEST the base version for the changeset instead of the original, hiding the changes that are already under version control (and hopefully already reviewed).
Tested rbt post manually.
Using it in production for the last month.
| Description | From | Last Updated |
|---|---|---|
|
Can we do one string and one format operation? Adjacent string literals will get concatenated without using + operators (like … |
 david
|
|
|
These could be combined: self._versions, self._arrows = self._load_vtree(path) |
david
|
|
|
This should call re.escape on the path before formatting it into the regex. This should also prefix the string with … |
david
|
|
|
This should prefix the string with r (r"\s..."). I also don't see any format characters in the string, so the … |
david
|
|
|
Since this is called by something outside of this class, it should be called latest_from_branch (no underscore). |
david
|
|
|
This should probably call re.escape on branch, in case the branch name has regex special characters in it. |
david
|
|
|
Since this is called by something outside of this class, it should be called merge_arrows_towards (no underscore). |
david
|
