Show More
@@ -482,7 +482,7 b' def kwconverted(context, mapping, name):' | |||||
482 | rev = ctx.extra().get('convert_revision', '') |
|
482 | rev = ctx.extra().get('convert_revision', '') | |
483 | if rev.startswith('svn:'): |
|
483 | if rev.startswith('svn:'): | |
484 | if name == 'svnrev': |
|
484 | if name == 'svnrev': | |
485 |
return |
|
485 | return (b"%d" % subversion.revsplit(rev)[2]) | |
486 | elif name == 'svnpath': |
|
486 | elif name == 'svnpath': | |
487 | return subversion.revsplit(rev)[1] |
|
487 | return subversion.revsplit(rev)[1] | |
488 | elif name == 'svnuuid': |
|
488 | elif name == 'svnuuid': |
@@ -91,7 +91,7 b' class convert_cvs(converter_source):' | |||||
91 | for cs in db: |
|
91 | for cs in db: | |
92 | if maxrev and cs.id > maxrev: |
|
92 | if maxrev and cs.id > maxrev: | |
93 | break |
|
93 | break | |
94 |
id = |
|
94 | id = (b"%d" % cs.id) | |
95 | cs.author = self.recode(cs.author) |
|
95 | cs.author = self.recode(cs.author) | |
96 | self.lastbranch[cs.branch] = id |
|
96 | self.lastbranch[cs.branch] = id | |
97 | cs.comment = self.recode(cs.comment) |
|
97 | cs.comment = self.recode(cs.comment) | |
@@ -102,13 +102,13 b' class convert_cvs(converter_source):' | |||||
102 |
|
102 | |||
103 | files = {} |
|
103 | files = {} | |
104 | for f in cs.entries: |
|
104 | for f in cs.entries: | |
105 |
files[f.file] = "%s%s" % ('.'.join([ |
|
105 | files[f.file] = "%s%s" % ('.'.join([(b"%d" % x) | |
106 | for x in f.revision]), |
|
106 | for x in f.revision]), | |
107 | ['', '(DEAD)'][f.dead]) |
|
107 | ['', '(DEAD)'][f.dead]) | |
108 |
|
108 | |||
109 | # add current commit to set |
|
109 | # add current commit to set | |
110 | c = commit(author=cs.author, date=date, |
|
110 | c = commit(author=cs.author, date=date, | |
111 |
parents=[ |
|
111 | parents=[(b"%d" % p.id) for p in cs.parents], | |
112 | desc=cs.comment, branch=cs.branch or '') |
|
112 | desc=cs.comment, branch=cs.branch or '') | |
113 | self.changeset[id] = c |
|
113 | self.changeset[id] = c | |
114 | self.files[id] = files |
|
114 | self.files[id] = files |
@@ -919,7 +919,7 b' def debugcvsps(ui, *args, **opts):' | |||||
919 | if opts["parents"] and cs.parents: |
|
919 | if opts["parents"] and cs.parents: | |
920 | if len(cs.parents) > 1: |
|
920 | if len(cs.parents) > 1: | |
921 | ui.write(('Parents: %s\n' % |
|
921 | ui.write(('Parents: %s\n' % | |
922 |
(','.join([ |
|
922 | (','.join([(b"%d" % p.id) for p in cs.parents])))) | |
923 | else: |
|
923 | else: | |
924 | ui.write(('Parent: %d\n' % cs.parents[0].id)) |
|
924 | ui.write(('Parent: %d\n' % cs.parents[0].id)) | |
925 |
|
925 | |||
@@ -941,18 +941,18 b' def debugcvsps(ui, *args, **opts):' | |||||
941 | fn = fn[len(opts["prefix"]):] |
|
941 | fn = fn[len(opts["prefix"]):] | |
942 | ui.write('\t%s:%s->%s%s \n' % ( |
|
942 | ui.write('\t%s:%s->%s%s \n' % ( | |
943 | fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL', |
|
943 | fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL', | |
944 |
'.'.join([ |
|
944 | '.'.join([(b"%d" % x) for x in f.revision]), | |
945 | ['', '(DEAD)'][f.dead])) |
|
945 | ['', '(DEAD)'][f.dead])) | |
946 | ui.write('\n') |
|
946 | ui.write('\n') | |
947 |
|
947 | |||
948 | # have we seen the start tag? |
|
948 | # have we seen the start tag? | |
949 | if revisions and off: |
|
949 | if revisions and off: | |
950 |
if revisions[0] == |
|
950 | if revisions[0] == (b"%d" % cs.id) or \ | |
951 | revisions[0] in cs.tags: |
|
951 | revisions[0] in cs.tags: | |
952 | off = False |
|
952 | off = False | |
953 |
|
953 | |||
954 | # see if we reached the end tag |
|
954 | # see if we reached the end tag | |
955 | if len(revisions) > 1 and not off: |
|
955 | if len(revisions) > 1 and not off: | |
956 |
if revisions[1] == |
|
956 | if revisions[1] == (b"%d" % cs.id) or \ | |
957 | revisions[1] in cs.tags: |
|
957 | revisions[1] in cs.tags: | |
958 | break |
|
958 | break |
@@ -348,7 +348,7 b' class lock(object):' | |||||
348 | if self._parentheld: |
|
348 | if self._parentheld: | |
349 | lockname = self.parentlock |
|
349 | lockname = self.parentlock | |
350 | else: |
|
350 | else: | |
351 |
lockname = '%s:% |
|
351 | lockname = b'%s:%d' % (lock._host, self.pid) | |
352 | self._inherited = True |
|
352 | self._inherited = True | |
353 | try: |
|
353 | try: | |
354 | yield lockname |
|
354 | yield lockname |
General Comments 0
You need to be logged in to leave comments.
Login now