Mercurial > hg-stable
changeset 10703:1ee60e82333c
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 15 Mar 2010 16:36:32 -0500 |
| parents | 1437542a9fd7 (current diff) 35893dcfd40c (diff) |
| children | 194342b34870 1b444721981c |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/cvsps.py Fri Mar 12 16:16:47 2010 -0600 +++ b/hgext/convert/cvsps.py Mon Mar 15 16:36:32 2010 -0500 @@ -32,6 +32,7 @@ .branchpoints- the branches that start at the current entry ''' def __init__(self, **entries): + self.synthetic = False self.__dict__.update(entries) def __repr__(self): @@ -296,8 +297,7 @@ assert match, _('expected revision number') e = logentry(rcs=scache(rcs), file=scache(filename), revision=tuple([int(x) for x in match.group(1).split('.')]), - branches=[], parent=None, - synthetic=False) + branches=[], parent=None) state = 6 elif state == 6: @@ -469,6 +469,7 @@ .branchpoints- the branches that start at the current entry ''' def __init__(self, **entries): + self.synthetic = False self.__dict__.update(entries) def __repr__(self): @@ -542,8 +543,7 @@ # "File file4 was added on branch ..." (synthetic, 1 entry) # "Add file3 and file4 to fix ..." (real, 2 entries) # Hence the check for 1 entry here. - synth = getattr(c.entries[0], 'synthetic', None) - c.synthetic = (len(c.entries) == 1 and synth) + c.synthetic = len(c.entries) == 1 and c.entries[0].synthetic # Sort files in each changeset