Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 23735:b9d06fa10ef2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 06 Jan 2015 18:18:28 -0600
parents e41bcb019633 f4e6475950f1
children 07309e527df7
comparison
equal deleted inserted replaced
23733:86810cd85eb8 23735:b9d06fa10ef2
1070 1070
1071 self.ui.write(',\n "extra": {%s}' % 1071 self.ui.write(',\n "extra": {%s}' %
1072 ", ".join('"%s": "%s"' % (j(k), j(v)) 1072 ", ".join('"%s": "%s"' % (j(k), j(v))
1073 for k, v in ctx.extra().items())) 1073 for k, v in ctx.extra().items()))
1074 1074
1075 files = ctx.status(ctx.p1()) 1075 files = ctx.p1().status(ctx)
1076 self.ui.write(',\n "modified": [%s]' % 1076 self.ui.write(',\n "modified": [%s]' %
1077 ", ".join('"%s"' % j(f) for f in files[0])) 1077 ", ".join('"%s"' % j(f) for f in files[0]))
1078 self.ui.write(',\n "added": [%s]' % 1078 self.ui.write(',\n "added": [%s]' %
1079 ", ".join('"%s"' % j(f) for f in files[1])) 1079 ", ".join('"%s"' % j(f) for f in files[1]))
1080 self.ui.write(',\n "removed": [%s]' % 1080 self.ui.write(',\n "removed": [%s]' %