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