comparison hgext/mq.py @ 5673:dd3ce7515f4d

mq: add --currentuser and --user options to qnew and qrefresh

These options make qnew and qrefresh add/update the "From:" header (or, if present,
the "# User" header). This allows proper attribution of patches in patch queues
with multiple contributors.

5653:1b35bc1c1968

        return m, a, r, d

    def new(self, repo, patch, *pats, **opts):
        msg = opts.get('msg')
        force = opts.get('force')
        if os.path.exists(self.join(patch)):
            raise util.Abort(_('patch "%s" already exists') % patch)
        if opts.get('include') or opts.get('exclude') or pats:
            fns, match, anypats = cmdutil.matchpats(repo, pats, opts)
            m, a, r, d = repo.status(files=fns, match=match)[:4]

        self.check_toppatch(repo)
        wlock = repo.wlock()
        try:
            insert = self.full_series_end()
            commitmsg = msg and msg or ("[mq]: %s" % patch)
            n = repo.commit(commitfiles, commitmsg, match=match, force=True)
            if n == None:
                raise util.Abort(_("repo commit failed"))
            self.full_series[insert:insert] = [patch]
            self.applied.append(statusentry(revlog.hex(n), patch))
            self.parse_series()
            self.series_dirty = 1
            self.applied_dirty = 1
            p = self.opener(patch, "w")
            if msg:
                msg = msg + "\n"
                p.write(msg)
            p.close()
            wlock = None

                ci = 0
                for mi in xrange(len(message)):
                    while message[mi] != comments[ci]:
                        ci += 1
                    del comments[ci]
            if msg:
                comments.append(msg)

            patchf.seek(0)
            patchf.truncate()

                    else:
                        message = "\n".join(message)
                else:
                    message = msg

                self.strip(repo, top, update=False,
                           backup='strip')
                n = repo.commit(filelist, message, changes[1], match=matchfn,
                                force=1)
                self.applied[-1] = statusentry(revlog.hex(n), patchfn)
                self.applied_dirty = 1
                self.removeundo(repo)
            else:

        ui.write("No patches applied\n")
        return 1
    return q.qseries(repo, start=l-2, length=1, status='A',
                     summary=opts.get('summary'))

def new(ui, repo, patch, *args, **opts):
    """create a new patch

    qnew creates a new patch on top of the currently-applied patch
    (if any). It will refuse to run if there are any outstanding

    q = repo.mq
    message = cmdutil.logmessage(opts)
    if opts['edit']:
        message = ui.edit(message, ui.username())
    opts['msg'] = message
    q.new(repo, patch, *args, **opts)
    q.save_dirty()
    return 0

def refresh(ui, repo, *pats, **opts):

        if message:
            raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
        patch = q.applied[-1].name
        (message, comment, user, date, hasdiff) = q.readheaders(patch)
        message = ui.edit('\n'.join(message), user or ui.username())
    ret = q.refresh(repo, pats, msg=message, **opts)
    q.save_dirty()
    return ret

def diff(ui, repo, *pats, **opts):

        repo.__class__ = mqrepo
        repo.mq = queue(ui, repo.join(""))

seriesopts = [('s', 'summary', None, _('print first line of patch header'))]

cmdtable = {
    "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')),
    "qclone":
        (clone,
         [('', 'pull', None, _('use pull protocol to copy metadata')),

    "qnew":
        (new,
         [('e', 'edit', None, _('edit commit message')),
          ('f', 'force', None, _('import uncommitted changes into patch')),
          ('g', 'git', None, _('use git extended diff format')),
          ] + commands.walkopts + commands.commitopts,
         _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')),
    "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),
    "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')),
    "^qpop":
        (pop,

    "^qrefresh":
        (refresh,
         [('e', 'edit', None, _('edit commit message')),
          ('g', 'git', None, _('use git extended diff format')),
          ('s', 'short', None, _('refresh only files already in the patch')),
          ] + commands.walkopts + commands.commitopts,
         _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
    'qrename|qmv':
        (rename, [], _('hg qrename PATCH1 [PATCH2]')),
    "qrestore":
        (restore,

5673:dd3ce7515f4d

        return m, a, r, d

    def new(self, repo, patch, *pats, **opts):
        msg = opts.get('msg')
        force = opts.get('force')
        user = opts.get('user')
        if os.path.exists(self.join(patch)):
            raise util.Abort(_('patch "%s" already exists') % patch)
        if opts.get('include') or opts.get('exclude') or pats:
            fns, match, anypats = cmdutil.matchpats(repo, pats, opts)
            m, a, r, d = repo.status(files=fns, match=match)[:4]

        self.check_toppatch(repo)
        wlock = repo.wlock()
        try:
            insert = self.full_series_end()
            commitmsg = msg and msg or ("[mq]: %s" % patch)
            n = repo.commit(commitfiles, commitmsg, user, match=match, force=True)
            if n == None:
                raise util.Abort(_("repo commit failed"))
            self.full_series[insert:insert] = [patch]
            self.applied.append(statusentry(revlog.hex(n), patch))
            self.parse_series()
            self.series_dirty = 1
            self.applied_dirty = 1
            p = self.opener(patch, "w")
            if user:
                p.write("From: " + user + "\n\n")
            if msg:
                msg = msg + "\n"
                p.write(msg)
            p.close()
            wlock = None

                ci = 0
                for mi in xrange(len(message)):
                    while message[mi] != comments[ci]:
                        ci += 1
                    del comments[ci]

            newuser = opts.get('user')
            if newuser:
                # Update all references to a user in the patch header.
                # If none found, add "From: " header.
                needfrom = True
                for prefix in ['# User ', 'From: ']:
                    for i in xrange(len(comments)):
                        if comments[i].startswith(prefix):
                            comments[i] = prefix + newuser
                            needfrom = False
                            break
                if needfrom:
                    comments = ['From: ' + newuser, ''] + comments
                user = newuser

            if msg:
                comments.append(msg)

            patchf.seek(0)
            patchf.truncate()

                    else:
                        message = "\n".join(message)
                else:
                    message = msg

                if not user:
                    user = changes[1]

                self.strip(repo, top, update=False,
                           backup='strip')
                n = repo.commit(filelist, message, user, match=matchfn,
                                force=1)
                self.applied[-1] = statusentry(revlog.hex(n), patchfn)
                self.applied_dirty = 1
                self.removeundo(repo)
            else:

        ui.write("No patches applied\n")
        return 1
    return q.qseries(repo, start=l-2, length=1, status='A',
                     summary=opts.get('summary'))

def setupheaderopts(ui, opts):
    def do(opt,val):
        if not opts[opt] and opts['current' + opt]:
            opts[opt] = val
    do('user', ui.username())

def new(ui, repo, patch, *args, **opts):
    """create a new patch

    qnew creates a new patch on top of the currently-applied patch
    (if any). It will refuse to run if there are any outstanding

    q = repo.mq
    message = cmdutil.logmessage(opts)
    if opts['edit']:
        message = ui.edit(message, ui.username())
    opts['msg'] = message
    setupheaderopts(ui, opts)
    q.new(repo, patch, *args, **opts)
    q.save_dirty()
    return 0

def refresh(ui, repo, *pats, **opts):

        if message:
            raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
        patch = q.applied[-1].name
        (message, comment, user, date, hasdiff) = q.readheaders(patch)
        message = ui.edit('\n'.join(message), user or ui.username())
    setupheaderopts(ui, opts)
    ret = q.refresh(repo, pats, msg=message, **opts)
    q.save_dirty()
    return ret

def diff(ui, repo, *pats, **opts):

        repo.__class__ = mqrepo
        repo.mq = queue(ui, repo.join(""))

seriesopts = [('s', 'summary', None, _('print first line of patch header'))]

headeropts = [
    ('U', 'currentuser', None, _('add "From: <current user>" to patch')),
    ('u', 'user', '', _('add "From: <given user>" to patch'))]

cmdtable = {
    "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')),
    "qclone":
        (clone,
         [('', 'pull', None, _('use pull protocol to copy metadata')),

    "qnew":
        (new,
         [('e', 'edit', None, _('edit commit message')),
          ('f', 'force', None, _('import uncommitted changes into patch')),
          ('g', 'git', None, _('use git extended diff format')),
          ] + commands.walkopts + commands.commitopts + headeropts,
         _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')),
    "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),
    "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')),
    "^qpop":
        (pop,

    "^qrefresh":
        (refresh,
         [('e', 'edit', None, _('edit commit message')),
          ('g', 'git', None, _('use git extended diff format')),
          ('s', 'short', None, _('refresh only files already in the patch')),
          ] + commands.walkopts + commands.commitopts + headeropts,
         _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
    'qrename|qmv':
        (rename, [], _('hg qrename PATCH1 [PATCH2]')),
    "qrestore":
        (restore,