Sourcery refactored master branch #1
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -59,22 +59,21 @@ def usage(): | ||
| #------------------------------------------------------------------------------ | ||
|
|
||
| def getgitenv(user, date): | ||
| env = '' | ||
| if elems := re.compile('(.*?)\s+<(.*)>').match(user): | ||
| env += f'export GIT_AUTHOR_NAME="{elems[1]}" ;' | ||
| env += f'export GIT_COMMITTER_NAME="{elems[1]}" ;' | ||
| env += f'export GIT_AUTHOR_EMAIL="{elems[2]}" ;' | ||
| env += f'export GIT_COMMITTER_EMAIL="{elems[2]}" ;' | ||
| else: | ||
| env += f'export GIT_AUTHOR_NAME="{user}" ;' | ||
| env += f'export GIT_COMMITTER_NAME="{user}" ;' | ||
| env += 'export GIT_AUTHOR_EMAIL= ;' | ||
| env += 'export GIT_COMMITTER_EMAIL= ;' | ||
|
|
||
| env += f'export GIT_AUTHOR_DATE="{date}" ;' | ||
| env += f'export GIT_COMMITTER_DATE="{date}" ;' | ||
| return env | ||
|
Comment on lines
-62
to
+76
There was a problem hiding this comment. Function
|
||
|
|
||
| #------------------------------------------------------------------------------ | ||
|
|
||
| @@ -124,35 +123,27 @@ def getgitenv(user, date): | ||
| hgparents["0"] = (None, None) | ||
| hgbranch["0"] = "master" | ||
| for cset in range(1, int(tip) + 1): | ||
| hgchildren[str(cset)] = () | ||
| prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().strip().split(' ') | ||
| prnts = map(lambda x: x[:x.find(':')], prnts) | ||
| parent = prnts[0].strip() if prnts[0] != '' else str(cset - 1) | ||
| hgchildren[parent] += ( str(cset), ) | ||
| if len(prnts) > 1: | ||
| mparent = prnts[1].strip() | ||
| hgchildren[mparent] += ( str(cset), ) | ||
| else: | ||
| mparent = None | ||
|
|
||
| hgparents[str(cset)] = (parent, mparent) | ||
|
|
||
| if mparent: | ||
| # For merge changesets, take either one, preferably the 'master' branch | ||
| hgbranch[str(cset)] = ('master' if hgbranch[mparent] == 'master' else | ||
| hgbranch[parent]) | ||
| elif hgchildren[parent][0] == str(cset): | ||
| hgbranch[str(cset)] = hgbranch[parent] | ||
| else: | ||
| hgbranch[str(cset)] = f"branch-{str(cset)}" | ||
|
Comment on lines
-127
to
+146
There was a problem hiding this comment. Lines
This removes the following comments ( why? ): |
||
|
|
||
| if "0" not in hgvers: | ||
| print('creating repository') | ||
| @@ -161,85 +152,89 @@ def getgitenv(user, date): | ||
| # loop through every hg changeset | ||
| for cset in range(int(tip) + 1): | ||
|
|
||
| # incremental, already seen | ||
| if str(cset) in hgvers: | ||
| continue | ||
| hgnewcsets += 1 | ||
|
|
||
| # get info | ||
| log_data = os.popen('hg log -r %d --template "{tags}\n{date|date}\n{author}\n"' % cset).readlines() | ||
| tag = log_data[0].strip() | ||
| date = log_data[1].strip() | ||
| user = log_data[2].strip() | ||
| parent = hgparents[str(cset)][0] | ||
| mparent = hgparents[str(cset)][1] | ||
|
|
||
| #get comment | ||
| (fdcomment, filecomment) = tempfile.mkstemp() | ||
| csetcomment = os.popen('hg log -r %d --template "{desc}"' % cset).read().strip() | ||
| os.write(fdcomment, csetcomment) | ||
| os.close(fdcomment) | ||
|
|
||
| print('-----------------------------------------') | ||
| print('cset:', cset) | ||
| print('branch:', hgbranch[str(cset)]) | ||
| print('user:', user) | ||
| print('date:', date) | ||
| print('comment:', csetcomment) | ||
| if parent: | ||
| print('parent:', parent) | ||
| if mparent: | ||
| print('mparent:', mparent) | ||
| if tag: | ||
| print('tag:', tag) | ||
| print('-----------------------------------------') | ||
|
|
||
| # checkout the parent if necessary | ||
| if cset != 0: | ||
| if hgbranch[str(cset)] == f"branch-{str(cset)}": | ||
| print('creating new branch', hgbranch[str(cset)]) | ||
| os.system(f'git checkout -b {hgbranch[str(cset)]} {hgvers[parent]}') | ||
| else: | ||
| print('checking out branch', hgbranch[str(cset)]) | ||
| os.system(f'git checkout {hgbranch[str(cset)]}') | ||
|
|
||
| # merge | ||
| if mparent: | ||
| if hgbranch[parent] == hgbranch[str(cset)]: | ||
| otherbranch = hgbranch[mparent] | ||
| else: | ||
| otherbranch = hgbranch[parent] | ||
| print('merging', otherbranch, 'into', hgbranch[str(cset)]) | ||
| os.system( | ||
| f'{getgitenv(user, date)}git merge --no-commit -s ours "" {hgbranch[str(cset)]} {otherbranch}' | ||
| ) | ||
|
|
||
| # remove everything except .git and .hg directories | ||
| os.system('find . \( -path "./.hg" -o -path "./.git" \) -prune -o ! -name "." -print | xargs rm -rf') | ||
|
|
||
| # repopulate with checkouted files | ||
| os.system('hg update -C %d' % cset) | ||
|
|
||
| # add new files | ||
| os.system('git ls-files -x .hg --others | git update-index --add --stdin') | ||
| # delete removed files | ||
| os.system('git ls-files -x .hg --deleted | git update-index --remove --stdin') | ||
|
|
||
| # commit | ||
| os.system( | ||
| f'{getgitenv(user, date)}git commit --allow-empty --allow-empty-message -a -F {filecomment}' | ||
| ) | ||
| os.unlink(filecomment) | ||
|
|
||
| # tag | ||
| if tag and tag != 'tip': | ||
| os.system(f'{getgitenv(user, date)}git tag {tag}') | ||
|
|
||
| # delete branch if not used anymore... | ||
| if mparent and len(hgchildren[str(cset)]): | ||
| print("Deleting unused branch:", otherbranch) | ||
| os.system(f'git branch -d {otherbranch}') | ||
|
|
||
| # retrieve and record the version | ||
| vvv = os.popen('git show --quiet --pretty=format:%H').read() | ||
| print('record', cset, '->', vvv) | ||
| hgvers[str(cset)] = vvv | ||
|
|
||
| if hgnewcsets >= opt_nrepack and opt_nrepack != -1: | ||
| os.system('git repack -a -d') | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lines
38-75refactored with the following changes:dict()with{}(dict-literal)min-max-identity)none-compare)use-fstring-for-concatenation)use-dict-items)remove-dict-keys)