Show More
@@ -32,6 +32,7 b' class logentry(object):' | |||
|
32 | 32 | .branchpoints- the branches that start at the current entry |
|
33 | 33 | ''' |
|
34 | 34 | def __init__(self, **entries): |
|
35 | self.synthetic = False | |
|
35 | 36 | self.__dict__.update(entries) |
|
36 | 37 | |
|
37 | 38 | def __repr__(self): |
@@ -296,8 +297,7 b' def createlog(ui, directory=None, root="' | |||
|
296 | 297 | assert match, _('expected revision number') |
|
297 | 298 | e = logentry(rcs=scache(rcs), file=scache(filename), |
|
298 | 299 | revision=tuple([int(x) for x in match.group(1).split('.')]), |
|
299 |
branches=[], parent=None |
|
|
300 | synthetic=False) | |
|
300 | branches=[], parent=None) | |
|
301 | 301 | state = 6 |
|
302 | 302 | |
|
303 | 303 | elif state == 6: |
@@ -469,6 +469,7 b' class changeset(object):' | |||
|
469 | 469 | .branchpoints- the branches that start at the current entry |
|
470 | 470 | ''' |
|
471 | 471 | def __init__(self, **entries): |
|
472 | self.synthetic = False | |
|
472 | 473 | self.__dict__.update(entries) |
|
473 | 474 | |
|
474 | 475 | def __repr__(self): |
@@ -542,8 +543,7 b' def createchangeset(ui, log, fuzz=60, me' | |||
|
542 | 543 | # "File file4 was added on branch ..." (synthetic, 1 entry) |
|
543 | 544 | # "Add file3 and file4 to fix ..." (real, 2 entries) |
|
544 | 545 | # Hence the check for 1 entry here. |
|
545 |
synth = |
|
|
546 | c.synthetic = (len(c.entries) == 1 and synth) | |
|
546 | c.synthetic = len(c.entries) == 1 and c.entries[0].synthetic | |
|
547 | 547 | |
|
548 | 548 | # Sort files in each changeset |
|
549 | 549 |
General Comments 0
You need to be logged in to leave comments.
Login now