equal
deleted
inserted
replaced
2878 if default or id: |
2878 if default or id: |
2879 output = ["%s%s" % |
2879 output = ["%s%s" % |
2880 ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
2880 ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
2881 if num: |
2881 if num: |
2882 output.append("%s%s" % |
2882 output.append("%s%s" % |
2883 ('+'.join([str(p.rev()) for p in parents]), changed)) |
2883 ('+'.join([pycompat.bytestr(p.rev()) for p in parents]), |
|
2884 changed)) |
2884 else: |
2885 else: |
2885 if default or id: |
2886 if default or id: |
2886 output = [hexfunc(ctx.node())] |
2887 output = [hexfunc(ctx.node())] |
2887 if num: |
2888 if num: |
2888 output.append(str(ctx.rev())) |
2889 output.append(pycompat.bytestr(ctx.rev())) |
2889 taglist = ctx.tags() |
2890 taglist = ctx.tags() |
2890 |
2891 |
2891 if default and not ui.quiet: |
2892 if default and not ui.quiet: |
2892 b = ctx.branch() |
2893 b = ctx.branch() |
2893 if b != 'default': |
2894 if b != 'default': |