comparison mercurial/cmdutil.py @ 17932:c8ffde272653

Merge with crew-stable.

17930:7788b5e7d9ef

                    except KeyError:
                        raise IOError

                user = opts.get('user') or old.user()
                date = opts.get('date') or old.date()
            if not message:
                message = old.description()

            pureextra = extra.copy()
            extra['amend_source'] = old.hex()

                                 files=files,
                                 filectxfn=filectxfn,
                                 user=user,
                                 date=date,
                                 extra=extra)
            new._text = commitforceeditor(repo, new, [])

            newdesc =  changelog.stripdesc(new.description())
            if ((not node)
                and newdesc == old.description()
                and user == old.user()

17932:c8ffde272653

                    except KeyError:
                        raise IOError

                user = opts.get('user') or old.user()
                date = opts.get('date') or old.date()
            editmsg = False
            if not message:
                editmsg = True
                message = old.description()

            pureextra = extra.copy()
            extra['amend_source'] = old.hex()

                                 files=files,
                                 filectxfn=filectxfn,
                                 user=user,
                                 date=date,
                                 extra=extra)
            if editmsg:
                new._text = commitforceeditor(repo, new, [])

            newdesc =  changelog.stripdesc(new.description())
            if ((not node)
                and newdesc == old.description()
                and user == old.user()