This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7732

convert: refactor authormap into separate function for outside use
ClosedPublic

Authored by joerg.sonnenberger on Dec 27 2019, 3:10 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfdaa4233dc18: convert: refactor authormap into separate function for outside use

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit added a subscriber: pulkit.Dec 30 2019, 8:19 AM
pulkit added inline comments.
hgext/convert/convcmd.py
481

This will reassign self.authors instead of updating it. readauthormap is called twice in the __init__().

pulkit added inline comments.Jan 8 2020, 7:06 AM
hgext/convert/convcmd.py
58

We disallow usage of default mutable arguments. Hence test-check-code.t says hi.

+  hgext/convert/convcmd.py:58:
+   > def readauthormap(ui, authorfile, authors={}):
+   don't use mutable default arguments
pulkit accepted this revision.Jan 17 2020, 9:42 AM
This revision is now accepted and ready to land.Jan 17 2020, 9:42 AM
pulkit added a comment.Jan 17 2020, 10:08 AM

Amending the following in flight to make test-check-format.t (or black) happy:

diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -55,6 +55,7 @@ svn_source = subversion.svn_source
 
 orig_encoding = b'ascii'
 
+
 def readauthormap(ui, authorfile, authors=None):
     if authors is None:
         authors = {}
@@ -84,6 +85,7 @@ def readauthormap(ui, authorfile, author
             ui.status(m % (srcauthor, authors[srcauthor], dstauthor))
     return authors
 
+
 def recode(s):
     if isinstance(s, pycompat.unicode):
         return s.encode(pycompat.sysstr(orig_encoding), 'replace')

Revision Contents
Changeset List

PathPackages
Mhgext/convert/convcmd.py (57 lines)

Diff 19407

hgext/convert/convcmd.py

mercurial_source = hgconvert.mercurial_source mercurial_source = hgconvert.mercurial_source
monotone_source = monotone.monotone_source monotone_source = monotone.monotone_source
p4_source = p4.p4_source p4_source = p4.p4_source
svn_sink = subversion.svn_sink svn_sink = subversion.svn_sink
svn_source = subversion.svn_source svn_source = subversion.svn_source
orig_encoding = b'ascii' orig_encoding = b'ascii'
pulkitUnsubmitted
Not Done

We disallow usage of default mutable arguments. Hence test-check-code.t says hi.

+  hgext/convert/convcmd.py:58:
+   > def readauthormap(ui, authorfile, authors={}):
+   don't use mutable default arguments
pulkit: We disallow usage of default mutable arguments. Hence `test-check-code.t` says hi. ``` +…
def readauthormap(ui, authorfile, authors=None):
if authors is None:
authors = {}
with open(authorfile, b'rb') as afile:
for line in afile:
line = line.strip()
if not line or line.startswith(b'#'):
continue
try:
srcauthor, dstauthor = line.split(b'=', 1)
except ValueError:
msg = _(b'ignoring bad line in author map file %s: %s\n')
ui.warn(msg % (authorfile, line.rstrip()))
continue
srcauthor = srcauthor.strip()
dstauthor = dstauthor.strip()
if authors.get(srcauthor) in (None, dstauthor):
msg = _(b'mapping author %s to %s\n')
ui.debug(msg % (srcauthor, dstauthor))
authors[srcauthor] = dstauthor
continue
m = _(b'overriding mapping for author %s, was %s, will be %s\n')
ui.status(m % (srcauthor, authors[srcauthor], dstauthor))
return authors
def recode(s): def recode(s):
if isinstance(s, pycompat.unicode): if isinstance(s, pycompat.unicode):
return s.encode(pycompat.sysstr(orig_encoding), 'replace') return s.encode(pycompat.sysstr(orig_encoding), 'replace')
else: else:
return s.decode('utf-8').encode( return s.decode('utf-8').encode(
pycompat.sysstr(orig_encoding), 'replace' pycompat.sysstr(orig_encoding), 'replace'
) )
ofile.write( ofile.write(
util.tonativeeol( util.tonativeeol(
b"%s=%s\n" % (author, self.authors[author]) b"%s=%s\n" % (author, self.authors[author])
) )
) )
ofile.close() ofile.close()
def readauthormap(self, authorfile): def readauthormap(self, authorfile):
afile = open(authorfile, b'rb') self.authors = readauthormap(self.ui, authorfile, self.authors)
pulkitUnsubmitted
Not Done

This will reassign self.authors instead of updating it. readauthormap is called twice in the __init__().

pulkit: This will reassign `self.authors` instead of updating it. `readauthormap` is called twice in…
for line in afile:
line = line.strip()
if not line or line.startswith(b'#'):
continue
try:
srcauthor, dstauthor = line.split(b'=', 1)
except ValueError:
msg = _(b'ignoring bad line in author map file %s: %s\n')
self.ui.warn(msg % (authorfile, line.rstrip()))
continue
srcauthor = srcauthor.strip()
dstauthor = dstauthor.strip()
if self.authors.get(srcauthor) in (None, dstauthor):
msg = _(b'mapping author %s to %s\n')
self.ui.debug(msg % (srcauthor, dstauthor))
self.authors[srcauthor] = dstauthor
continue
m = _(b'overriding mapping for author %s, was %s, will be %s\n')
self.ui.status(m % (srcauthor, self.authors[srcauthor], dstauthor))
afile.close()
def cachecommit(self, rev): def cachecommit(self, rev):
commit = self.source.getcommit(rev) commit = self.source.getcommit(rev)
commit.author = self.authors.get(commit.author, commit.author) commit.author = self.authors.get(commit.author, commit.author)
commit.branch = mapbranch(commit.branch, self.branchmap) commit.branch = mapbranch(commit.branch, self.branchmap)
self.commitcache[rev] = commit self.commitcache[rev] = commit
return commit return commit