mercurial/commands.py
changeset 33054 a49ab7f5e7e7
parent 33051 15a79ac823e8
child 33089 9e0d222f5687
equal deleted inserted replaced
33053:ef46d432e2e4 33054:a49ab7f5e7e7
  2773             parents = ctx.parents()
  2773             parents = ctx.parents()
  2774             taglist = []
  2774             taglist = []
  2775             for p in parents:
  2775             for p in parents:
  2776                 taglist.extend(p.tags())
  2776                 taglist.extend(p.tags())
  2777 
  2777 
  2778             changed = ""
  2778             dirty = ""
  2779             if (any(repo.status())
  2779             if (any(repo.status())
  2780                 or any(ctx.sub(s).dirty() for s in ctx.substate)):
  2780                 or any(ctx.sub(s).dirty() for s in ctx.substate)):
  2781                 changed = '+'
  2781                 dirty = '+'
  2782             fm.data(changed=changed)
  2782             fm.data(dirty=dirty)
  2783 
  2783 
  2784             hexoutput = [hexfunc(p.node()) for p in parents]
  2784             hexoutput = [hexfunc(p.node()) for p in parents]
  2785             if default or id:
  2785             if default or id:
  2786                 output = ["%s%s" % ('+'.join(hexoutput), changed)]
  2786                 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
  2787             fm.data(id="%s%s" % ('+'.join(hexoutput), changed))
  2787             fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
  2788 
  2788 
  2789             if num:
  2789             if num:
  2790                 numoutput = ["%d" % p.rev() for p in parents]
  2790                 numoutput = ["%d" % p.rev() for p in parents]
  2791                 output.append("%s%s" % ('+'.join(numoutput), changed))
  2791                 output.append("%s%s" % ('+'.join(numoutput), dirty))
  2792 
  2792 
  2793             for i, p in enumerate(parents):
  2793             for i, p in enumerate(parents):
  2794                 fn = fm.nested('p%d' % (i + 1))
  2794                 fn = fm.nested('p%d' % (i + 1))
  2795                 fn.startitem()
  2795                 fn.startitem()
  2796                 fn.data(rev=p.rev())
  2796                 fn.data(rev=p.rev())