equal
deleted
inserted
replaced
3057 extra.update(wctx.extra()) |
3057 extra.update(wctx.extra()) |
3058 |
3058 |
3059 user = opts.get('user') or old.user() |
3059 user = opts.get('user') or old.user() |
3060 date = opts.get('date') or old.date() |
3060 date = opts.get('date') or old.date() |
3061 |
3061 |
|
3062 # Parse the date to allow comparison between date and old.date() |
|
3063 date = util.parsedate(date) |
|
3064 |
3062 if len(old.parents()) > 1: |
3065 if len(old.parents()) > 1: |
3063 # ctx.files() isn't reliable for merges, so fall back to the |
3066 # ctx.files() isn't reliable for merges, so fall back to the |
3064 # slower repo.status() method |
3067 # slower repo.status() method |
3065 files = set([fn for st in repo.status(base, old)[:3] |
3068 files = set([fn for st in repo.status(base, old)[:3] |
3066 for fn in st]) |
3069 for fn in st]) |