This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1263

fbhistedit: add support for json input to histedit
ClosedPublic

Authored by pulkit on Oct 28 2017, 7:57 PM.
Tags
None
Subscribers
durham

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX75953fa704a2: fbhistedit: add support for json input to histedit
Summary

This patch adds support to histedit command to take input from json. The JSON
should be of following format:

{ "histedit": [

  {"action": "...", "node": "..."},
  {"action": "...", "command": "..."},
  {...}
]

}

For actions except "exec" and "execr", "node" is required and for "exec" and
"execr", "command" should be there.

The support is plugged in directly and is not hidden behind a config flag. After
this support, the parser which parses the commands file will assume that JSON is
given and will fallback to original parsing if it fails to convert the data in
the file to JSON.
In case where input is JSON but a key is missing, status message is shown and we
fallback to normal parsing.

Both small and large verbs are supported for the action part in JSON.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 28 2017, 7:57 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 28 2017, 7:57 PM
durham accepted this revision.Oct 31 2017, 2:43 PM
durham added a subscriber: durham.

Any reason this can't go upstream? Or are we just waiting because of the freeze?

hgext3rd/fbhistedit.py
217

Does histedit require that the node be a certain length? Are 40 character nodes fine? If not, do we need to trim this down to the appropriate length?

This revision is now accepted and ready to land.Oct 31 2017, 2:43 PM
pulkit updated this revision to Diff 3181.Oct 31 2017, 4:06 PM
pulkit added a comment.Oct 31 2017, 4:44 PM
In D1263#21153, @durham wrote:

Any reason this can't go upstream? Or are we just waiting because of the freeze?

Upstream does not has the exec and execr actions. So, if this goes upstream we need to wrap the parsing function for parsing command part in JSON.

hgext3rd/fbhistedit.py
217

Yes 40 character nodes are fine. I have updates one of the tests to use full hashes.

Closed by commit rFBHGX75953fa704a2: fbhistedit: add support for json input to histedit (authored by pulkit). · Explain WhyNov 3 2017, 11:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbhistedit.py (26 lines)
AMtests/test-fbhistedit-json.t (222 lines)

Diff 3181

hgext3rd/fbhistedit.py

# fbhistedit.py - improved amend functionality # fbhistedit.py - improved amend functionality
# #
# Copyright 2014 Facebook, Inc. # Copyright 2014 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
"""extends the existing histedit functionality """extends the existing histedit functionality
Adds a s/stop verb to histedit to stop after a changeset was picked. Adds a s/stop verb to histedit to stop after a changeset was picked.
""" """
import json
from pipes import quote from pipes import quote
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
error, error,
encoding, encoding,
extensions, extensions,
_aliases, entry = cmdutil.findcmd('histedit', histedit.cmdtable) _aliases, entry = cmdutil.findcmd('histedit', histedit.cmdtable)
options = entry[1] options = entry[1]
options.append(('x', 'retry', False, options.append(('x', 'retry', False,
_('retry exec command that failed and try to continue'))) _('retry exec command that failed and try to continue')))
options.append(('', 'show-plan', False, _('show remaining actions list'))) options.append(('', 'show-plan', False, _('show remaining actions list')))
extensions.wrapfunction(histedit, '_histedit', _histedit) extensions.wrapfunction(histedit, '_histedit', _histedit)
extensions.wrapfunction(histedit, 'parserules', parserules)
def parserules(orig, rules, state):
try:
rules = _parsejsonrules(rules, state)
except ValueError:
pass
return orig(rules, state)
def _parsejsonrules(rules, state):
jsondata = json.loads(rules)
parsedrules = ''
try:
for entry in jsondata['histedit']:
if entry['action'] in set(['exec', 'execr']):
rest = entry['command']
else:
rest = entry['node']
durhamUnsubmitted
Not Done

Does histedit require that the node be a certain length? Are 40 character nodes fine? If not, do we need to trim this down to the appropriate length?

durham: Does histedit require that the node be a certain length? Are 40 character nodes fine? If not…
pulkitAuthorUnsubmitted
Not Done

Yes 40 character nodes are fine. I have updates one of the tests to use full hashes.

pulkit: Yes 40 character nodes are fine. I have updates one of the tests to use full hashes.
parsedrules += (entry['action'] + ' ' + rest + '\n')
except KeyError:
state.repo.ui.status(_("invalid JSON format, falling back "
"to normal parsing\n"))
return rules
return parsedrules
goalretry = 'retry' goalretry = 'retry'
goalshowplan = 'show-plan' goalshowplan = 'show-plan'
goalorig = 'orig' goalorig = 'orig'
def _getgoal(opts): def _getgoal(opts):
if opts.get('retry'): if opts.get('retry'):
return goalretry return goalretry

tests/test-fbhistedit-json.t

  • This file was added.
Tests JSON Input support for histedit
$ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF
> [extensions]
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit=
> rebase=
> [experimental]
> evolution=createmarkers
> EOF
$ initrepo ()
> {
> hg init r
> cd r
> for x in a b c ; do
> echo $x > $x
> hg add $x
> hg ci -m $x
> done
> }
$ initrepo
log before edit
$ hg log --graph -T "{rev}:{node|short} {desc}"
@ 2:177f92b77385 c
|
o 1:d2ae7f538514 b
|
o 0:cb9a9f314b8b a
passing a json with invalid format
$ cat >> input <<EOF
> {
> "rebase": [
> {"action": "foo", "node": "cb9a9f314b8b"},
> {"action": "pick", "node": "d2ae7f538514"},
> {"action": "pick", "node": "177f92b77385"}
> ]
> }
> EOF
$ hg histedit --commands input
invalid JSON format, falling back to normal parsing
hg: parse error: malformed line "{"
[255]
$ cat >> input2 <<EOF
> {
> "histedit": [
> {"node": "cb9a9f314b8b"},
> {"action": "pick", "node": "d2ae7f538514"},
> {"action": "pick", "node": "177f92b77385"}
> ]
> }
> EOF
$ hg histedit --commands input2
invalid JSON format, falling back to normal parsing
hg: parse error: malformed line "{"
[255]
$ cat >> input3 <<EOF
> {
> "histedit": [
> {"action": "pick", "node": "cb9a9f314b8b"},
> {"action": "pick"},
> {"action": "pick", "node": "177f92b77385"}
> ]
> }
> EOF
$ hg histedit --commands input3
invalid JSON format, falling back to normal parsing
hg: parse error: malformed line "{"
[255]
passing a json with invalid action
$ cat >> foo <<EOF
> {
> "histedit": [
> {"action": "foo", "node": "cb9a9f314b8b"},
> {"action": "pick", "node": "d2ae7f538514"},
> {"action": "pick", "node": "177f92b77385"}
> ]
> }
> EOF
$ hg histedit --commands foo
hg: parse error: unknown action "foo"
[255]
passing a json with invalid node
$ cat >> bar <<EOF
> {
> "histedit": [
> {"action": "pick", "node": "123456abcdef"},
> {"action": "pick", "node": "d2ae7f538514"},
> {"action": "pick", "node": "177f92b77385"}
> ]
> }
> EOF
$ hg histedit --commands bar
hg: parse error: unknown changeset 123456abcdef listed
[255]
running histedit with a valid json file
$ cat >> a.json <<EOF
> {
> "histedit": [
> {"action": "pick", "node": "cb9a9f314b8b"},
> {"action": "exec", "command": "hg exp"},
> {"action": "pick", "node": "177f92b77385"},
> {"action": "exec", "command": "hg exp"},
> {"action": "pick", "node": "d2ae7f538514"},
> {"action": "exec", "command": "hg exp"}
> ]
> }
> EOF
$ hg histedit --commands a.json
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
# Parent 0000000000000000000000000000000000000000
a
diff -r 000000000000 -r cb9a9f314b8b a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID b346ab9a313db8537ecf96fca3ca3ca984ef3bd7
# Parent cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
c
diff -r cb9a9f314b8b -r b346ab9a313d c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 503d1c1b466881fd108c7d4d26e78b510df14350
# Parent b346ab9a313db8537ecf96fca3ca3ca984ef3bd7
b
diff -r b346ab9a313d -r 503d1c1b4668 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b
log after histedit
$ hg log --graph -T "{rev}:{node|short} {desc}"
@ 4:503d1c1b4668 b
|
o 3:b346ab9a313d c
|
o 0:cb9a9f314b8b a
testing with abbreviated/small verbs
$ cat >> small <<EOF
> {
> "histedit": [
> {"action": "p", "node": "cb9a9f314b8b"},
> {"action": "p", "node": "503d1c1b4668"},
> {"action": "p", "node": "b346ab9a313d"}
> ]
> }
> EOF
$ hg histedit --commands small
$ hg log --graph -T "{rev}:{node} {desc}"
@ 6:573a8c672aaf44d2cf3f9467e5463f51f7414084 c
|
o 5:85032a8e4f13e773c4075d7c006e0f1bc1c63967 b
|
o 0:cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b a
more testing with full hashes
$ cat >> b.json <<EOF
> {
> "histedit": [
> {"action": "pick", "node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"},
> {"action": "pick", "node": "85032a8e4f13e773c4075d7c006e0f1bc1c63967"},
> {"action": "roll", "node": "573a8c672aaf44d2cf3f9467e5463f51f7414084"}
> ]
> }
> EOF
$ hg histedit --commands b.json
$ hg log --graph -T "{rev}:{node|short} {desc}"
@ 8:04e1eac0d294 b
|
o 0:cb9a9f314b8b a