This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2108

infinitepush: drop the `--to` flag to push and use `-B` instead
ClosedPublic

Authored by pulkit on Feb 9 2018, 6:47 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc5687ce3b411: infinitepush: drop the `--to` flag to push and use `-B` instead
Summary

The extension added a --to flag to specify the bookmark to which revs should
be pushed. This patch deletes that flag and instead uses the -B flag. After
this patch, bookmark passed as -B is parsed and if it matches the infinitepush
bookmark pattern, we consider that push as infinitepush.

This is still not the best of what we can do. Later patches in the series will
drop the use of -B flag and will instead handle things at bookmark bundle2
part. Plugging these logic to bookmark bundle2 part will also get rid of the
scratchbranchparttype bundle2 part.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 9 2018, 6:47 AM
pulkit added a subscriber: durham.Feb 9 2018, 7:03 AM

There is still some work required to make this extension better. I didn't want to grow my stack too long and hence send upto here. Few things which will be coming for sure:

  • removal of wrapping of push command on client side
  • using the bookmarks bundle2 part instead of scratchbranchparttype on both client and server side
  • drop the scratchbranchparttype bundle2 part
  • dropping the debugfillinfinitepushmetadata command defined in infinitepushcommands.py

There are things which I am not sure whether to keep or not:

  • the --bundle-store flag to push command
  • functionality to pull from bundlestore using hg pull
  • functionality to pull changesets from bundlestore if a changeset is not found locally on hg update
  • logic around sql store
  • interaction with the hoisting functionality of remotenames extension which is also being moved to core

Once these things are figured out, then I will try to add support for old clients and the clients on which we have no control. Also I will like to get these reviews less painful as much possible, so if there is any another way which can make the review easy, I will be happy to follow.

cc: @durham

indygreg accepted this revision.Feb 9 2018, 10:15 PM
indygreg added a subscriber: indygreg.

I'm find with you sending more parts to this series. Especially if they delete code: if they delete code then my review of the import will be a review of the final state of the code post deletions.

This revision is now accepted and ready to land.Feb 9 2018, 10:15 PM
durham added a comment.Feb 12 2018, 4:43 PM

There are things which I am not sure whether to keep or not:

  • the --bundle-store flag to push command

This is useful for scripts or tools that want to upload a commit to the cloud without having to give it a name. For instance, you can use it to push a commit then send that commit hash to some build service which can checkout the commit without having to worry about a bookmark name. But this could always be added back later, so it's probably fine to drop it if there's not an immediate need in Mozilla's use case.

  • functionality to pull from bundlestore using hg pull

Similar to the points above and below, this is useful for automation that already passes hashes around. Not having to pass around bookmark names as well means it's easier for that automation to migrate to infinitepush.

  • functionality to pull changesets from bundlestore if a changeset is not found locally on hg update

This is a bit of magic that user's really like. When combined with automatic backup pushes, it makes it feel like everyone is using the same repository. I'd highly recommend keeping this just for the eventual PR of saying "I can just hg commit, and my friend can do hg checkout HASH"

  • logic around sql store

Without this, would the server always store data in the filesystem? The sql store seems like an important bit of making this robust in enterprise usage.

  • interaction with the hoisting functionality of remotenames extension which is also being moved to core

I'm not familiar with how infinitepush plays into hoisting, but I just wanted to make sure users never have to type 'remote/' or 'default/'.

indygreg added a comment.Feb 12 2018, 4:57 PM
In D2108#36335, @durham wrote:

There are things which I am not sure whether to keep or not:

  • the --bundle-store flag to push command

This is useful for scripts or tools that want to upload a commit to the cloud without having to give it a name. For instance, you can use it to push a commit then send that commit hash to some build service which can checkout the commit without having to worry about a bookmark name. But this could always be added back later, so it's probably fine to drop it if there's not an immediate need in Mozilla's use case.

To be clear, Mozilla has 2 use cases where infinitepush could be useful:

  1. For our Try repository. Upload a nameless bundle somewhere and CI consumes it.
  2. For user repositories (basically forks of the main repos).
pulkit added a comment.Feb 15 2018, 5:18 AM
In D2108#35150, @indygreg wrote:

I'm find with you sending more parts to this series. Especially if they delete code: if they delete code then my review of the import will be a review of the final state of the code post deletions.

With discussions on D2096 and this patch, understanding your requirements, I think the wrapping of push command, the scratchbranchparttype bundle2 part etc. will be useful. So, can you review the current series with this patch as the last one?

Closed by commit rHGc5687ce3b411: infinitepush: drop the `--to` flag to push and use `-B` instead (authored by pulkit). · Explain WhyMar 30 2018, 3:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7422

hgext/infinitepush/__init__.py

wireproto.commands['lookup'] = ( wireproto.commands['lookup'] = (
_lookupwrap(wireproto.commands['lookup'][0]), 'key') _lookupwrap(wireproto.commands['lookup'][0]), 'key')
extensions.wrapfunction(exchange, 'getbundlechunks', getbundlechunks) extensions.wrapfunction(exchange, 'getbundlechunks', getbundlechunks)
extensions.wrapfunction(bundle2, 'processparts', processparts) extensions.wrapfunction(bundle2, 'processparts', processparts)
def clientextsetup(ui): def clientextsetup(ui):
entry = extensions.wrapcommand(commands.table, 'push', _push) entry = extensions.wrapcommand(commands.table, 'push', _push)
# Don't add the 'to' arg if it already exists
if not any(a for a in entry[1] if a[1] == 'to'):
entry[1].append(('', 'to', '', _('push revs to this bookmark')))
if not any(a for a in entry[1] if a[1] == 'non-forward-move'): if not any(a for a in entry[1] if a[1] == 'non-forward-move'):
entry[1].append(('', 'non-forward-move', None, entry[1].append(('', 'non-forward-move', None,
_('allows moving a remote bookmark to an ' _('allows moving a remote bookmark to an '
'arbitrary place'))) 'arbitrary place')))
entry[1].append( entry[1].append(
('', 'bundle-store', None, ('', 'bundle-store', None,
changes.append((scratchbook, changectx.node())) changes.append((scratchbook, changectx.node()))
repo._bookmarks.applychanges(repo, tr, changes) repo._bookmarks.applychanges(repo, tr, changes)
def _findcommonincoming(orig, *args, **kwargs): def _findcommonincoming(orig, *args, **kwargs):
common, inc, remoteheads = orig(*args, **kwargs) common, inc, remoteheads = orig(*args, **kwargs)
return common, True, remoteheads return common, True, remoteheads
def _push(orig, ui, repo, dest=None, *args, **opts): def _push(orig, ui, repo, dest=None, *args, **opts):
bookmark = opts.get('to') or ''
bookmark = opts.get('bookmark')
# we only support pushing one infinitepush bookmark at once
if len(bookmark) == 1:
bookmark = bookmark[0]
else:
bookmark = ''
oldphasemove = None oldphasemove = None
overrides = {(experimental, configbookmark): bookmark} overrides = {(experimental, configbookmark): bookmark}
with ui.configoverride(overrides, 'infinitepush'): with ui.configoverride(overrides, 'infinitepush'):
scratchpush = opts.get('bundle_store') scratchpush = opts.get('bundle_store')
if _scratchbranchmatcher(bookmark): if _scratchbranchmatcher(bookmark):
scratchpush = True scratchpush = True
# bundle2 can be sent back after push (for example, bundle2 # bundle2 can be sent back after push (for example, bundle2
# containing `pushkey` part to update bookmarks) # containing `pushkey` part to update bookmarks)
ui.setconfig(experimental, 'bundle2.pushback', True) ui.setconfig(experimental, 'bundle2.pushback', True)
ui.setconfig(experimental, confignonforwardmove, ui.setconfig(experimental, confignonforwardmove,
opts.get('non_forward_move'), '--non-forward-move') opts.get('non_forward_move'), '--non-forward-move')
if scratchpush: if scratchpush:
# this is an infinitepush, we don't want the bookmark to be applied
# rather that should be stored in the bundlestore
opts['bookmark'] = []
ui.setconfig(experimental, configscratchpush, True) ui.setconfig(experimental, configscratchpush, True)
oldphasemove = extensions.wrapfunction(exchange, oldphasemove = extensions.wrapfunction(exchange,
'_localphasemove', '_localphasemove',
_phasemove) _phasemove)
# Copy-paste from `push` command # Copy-paste from `push` command
path = ui.paths.getpath(dest, default=('default-push', 'default')) path = ui.paths.getpath(dest, default=('default-push', 'default'))
if not path: if not path:
raise error.Abort(_('default repository not configured!'), raise error.Abort(_('default repository not configured!'),

tests/test-infinitepush-bundlestore.t

$ hg push -r . $ hg push -r .
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
$ mkcommit scratchcommit $ mkcommit scratchcommit
$ hg push -r . --to scratch/mybranch $ hg push -r . -B scratch/mybranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
$ hg log -G $ hg log -G
@ changeset: 1:20759b6926ce @ changeset: 1:20759b6926ce
| bookmark: scratch/mybranch | bookmark: scratch/mybranch
| tag: tip | tag: tip
|/ |/
o initialcommit public o initialcommit public
Push to scratch branch Push to scratch branch
$ cd ../client2 $ cd ../client2
$ hg up -q scratch/mybranch $ hg up -q scratch/mybranch
$ mkcommit 'new scratch commit' $ mkcommit 'new scratch commit'
$ hg push -r . --to scratch/mybranch $ hg push -r . -B scratch/mybranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit remote: 1de1d7d92f89 new scratch commit
$ hg log -G -T '{desc} {phase} {bookmarks}' $ hg log -G -T '{desc} {phase} {bookmarks}'
@ new scratch commit draft scratch/mybranch @ new scratch commit draft scratch/mybranch
| |
o scratchcommit draft o scratchcommit draft
| |
o initialcommit public o initialcommit public
$ scratchnodes $ scratchnodes
1de1d7d92f8965260391d0513fe8a8d5973d3042 bed63daed3beba97fff2e819a148cf415c217a85 1de1d7d92f8965260391d0513fe8a8d5973d3042 bed63daed3beba97fff2e819a148cf415c217a85
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 bed63daed3beba97fff2e819a148cf415c217a85 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 bed63daed3beba97fff2e819a148cf415c217a85
$ scratchbookmarks $ scratchbookmarks
scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
Push scratch bookmark with no new revs Push scratch bookmark with no new revs
$ hg push -r . --to scratch/anotherbranch $ hg push -r . -B scratch/anotherbranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit remote: 1de1d7d92f89 new scratch commit
$ hg log -G -T '{desc} {phase} {bookmarks}' $ hg log -G -T '{desc} {phase} {bookmarks}'
@ new scratch commit draft scratch/anotherbranch scratch/mybranch @ new scratch commit draft scratch/anotherbranch scratch/mybranch
| |
$ scratchnodes $ scratchnodes
1de1d7d92f8965260391d0513fe8a8d5973d3042 66fa08ff107451320512817bed42b7f467a1bec3 1de1d7d92f8965260391d0513fe8a8d5973d3042 66fa08ff107451320512817bed42b7f467a1bec3
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3
2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3 2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3
Test with pushrebase Test with pushrebase
$ mkcommit scratchcommitwithpushrebase $ mkcommit scratchcommitwithpushrebase
$ hg push -r . --to scratch/mybranch $ hg push -r . -B scratch/mybranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 4 commits: remote: pushing 4 commits:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit remote: 1de1d7d92f89 new scratch commit
remote: 2b5d271c7e0d scratchcommitnobook remote: 2b5d271c7e0d scratchcommitnobook
remote: d8c4f54ab678 scratchcommitwithpushrebase remote: d8c4f54ab678 scratchcommitwithpushrebase
$ hg -R ../repo log -G -T '{desc} {phase}' $ hg -R ../repo log -G -T '{desc} {phase}'
o newcommit public o newcommit public
| |
o initialcommit public o initialcommit public
$ scratchnodes $ scratchnodes
1de1d7d92f8965260391d0513fe8a8d5973d3042 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 1de1d7d92f8965260391d0513fe8a8d5973d3042 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
Change the order of pushrebase and infinitepush Change the order of pushrebase and infinitepush
$ mkcommit scratchcommitwithpushrebase2 $ mkcommit scratchcommitwithpushrebase2
$ hg push -r . --to scratch/mybranch $ hg push -r . -B scratch/mybranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 5 commits: remote: pushing 5 commits:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit remote: 1de1d7d92f89 new scratch commit
remote: 2b5d271c7e0d scratchcommitnobook remote: 2b5d271c7e0d scratchcommitnobook
remote: d8c4f54ab678 scratchcommitwithpushrebase remote: d8c4f54ab678 scratchcommitwithpushrebase
remote: 6c10d49fe927 scratchcommitwithpushrebase2 remote: 6c10d49fe927 scratchcommitwithpushrebase2
o | scratchcommit draft o | scratchcommit draft
|/ |/
o initialcommit public o initialcommit public
$ scratchbookmarks $ scratchbookmarks
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da
$ hg push -r . --to scratch/mybranch $ hg push -r . -B scratch/mybranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: non-forward push remote: non-forward push
remote: (use --non-forward-move to override) remote: (use --non-forward-move to override)
abort: push failed on remote abort: push failed on remote
[255] [255]
$ hg push -r . --to scratch/mybranch --non-forward-move $ hg push -r . -B scratch/mybranch --non-forward-move
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 5 commits: remote: pushing 5 commits:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit remote: 1de1d7d92f89 new scratch commit
remote: 2b5d271c7e0d scratchcommitnobook remote: 2b5d271c7e0d scratchcommitnobook
remote: d8c4f54ab678 scratchcommitwithpushrebase remote: d8c4f54ab678 scratchcommitwithpushrebase
remote: 8872775dd97a scratch amended commit remote: 8872775dd97a scratch amended commit

tests/test-infinitepush.t

Create two new scratch bookmarks Create two new scratch bookmarks
$ hg up 0 $ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo scratchfirstpart > scratchfirstpart $ echo scratchfirstpart > scratchfirstpart
$ hg ci -Am "scratchfirstpart" $ hg ci -Am "scratchfirstpart"
adding scratchfirstpart adding scratchfirstpart
created new head created new head
$ hg push -r . --to scratch/firstpart $ hg push -r . -B scratch/firstpart
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 176993b87e39 scratchfirstpart remote: 176993b87e39 scratchfirstpart
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo scratchsecondpart > scratchsecondpart $ echo scratchsecondpart > scratchsecondpart
$ hg ci -Am "scratchsecondpart" $ hg ci -Am "scratchsecondpart"
adding scratchsecondpart adding scratchsecondpart
created new head created new head
$ hg push -r . --to scratch/secondpart $ hg push -r . -B scratch/secondpart
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 8db3891c220e scratchsecondpart remote: 8db3891c220e scratchsecondpart
Pull two bookmarks from the second client Pull two bookmarks from the second client
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/repo client2 -q $ hg clone ssh://user@dummy/repo client2 -q
$ echo testpullbycommithash1 > testpullbycommithash1 $ echo testpullbycommithash1 > testpullbycommithash1
$ hg ci -Am "testpullbycommithash1" $ hg ci -Am "testpullbycommithash1"
adding testpullbycommithash1 adding testpullbycommithash1
created new head created new head
$ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1 $ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1
$ echo testpullbycommithash2 > testpullbycommithash2 $ echo testpullbycommithash2 > testpullbycommithash2
$ hg ci -Aqm "testpullbycommithash2" $ hg ci -Aqm "testpullbycommithash2"
$ hg push -r . --to scratch/mybranch -q $ hg push -r . -B scratch/mybranch -q
Create third client and pull by commit hash. Create third client and pull by commit hash.
Make sure testpullbycommithash2 has not fetched Make sure testpullbycommithash2 has not fetched
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/repo client3 -q $ hg clone ssh://user@dummy/repo client3 -q
$ cd client3 $ cd client3
$ hg pull -r `cat ../testpullbycommithash1` $ hg pull -r `cat ../testpullbycommithash1`
pulling from ssh://user@dummy/repo pulling from ssh://user@dummy/repo
| o testpullbycommithash1 draft 33910bfe6ffe | o testpullbycommithash1 draft 33910bfe6ffe
|/ |/
@ initialcommit public 67145f466344 @ initialcommit public 67145f466344
$ hg up a79b6597f322 $ hg up a79b6597f322
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo scratchontopofpublic > scratchontopofpublic $ echo scratchontopofpublic > scratchontopofpublic
$ hg ci -Aqm "scratchontopofpublic" $ hg ci -Aqm "scratchontopofpublic"
$ hg push -r . --to scratch/scratchontopofpublic $ hg push -r . -B scratch/scratchontopofpublic
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: c70aee6da07d scratchontopofpublic remote: c70aee6da07d scratchontopofpublic
$ cd ../client2 $ cd ../client2
$ hg pull -B scratch/scratchontopofpublic $ hg pull -B scratch/scratchontopofpublic
pulling from ssh://user@dummy/repo pulling from ssh://user@dummy/repo
searching for changes searching for changes
> [infinitepush] > [infinitepush]
> fillmetadatabranchpattern=re:scratch/fillmetadata/.* > fillmetadatabranchpattern=re:scratch/fillmetadata/.*
> EOF > EOF
$ cd ../client $ cd ../client
$ echo tofillmetadata > tofillmetadata $ echo tofillmetadata > tofillmetadata
$ hg ci -Aqm "tofillmetadata" $ hg ci -Aqm "tofillmetadata"
$ hg log -r . -T '{node}\n' $ hg log -r . -T '{node}\n'
d2b0410d4da084bc534b1d90df0de9eb21583496 d2b0410d4da084bc534b1d90df0de9eb21583496
$ hg push -r . --to scratch/fillmetadata/fill $ hg push -r . -B scratch/fillmetadata/fill
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 6 commits: remote: pushing 6 commits:
remote: 33910bfe6ffe testpullbycommithash1 remote: 33910bfe6ffe testpullbycommithash1
remote: d8fde0ddfc96 testpullbycommithash2 remote: d8fde0ddfc96 testpullbycommithash2
remote: 3edfe7e9089a add and rm files remote: 3edfe7e9089a add and rm files
remote: c7ac39f638c6 cpfile and mvfile remote: c7ac39f638c6 cpfile and mvfile
remote: 09904fb20c53 add many files remote: 09904fb20c53 add many files
remote: d2b0410d4da0 tofillmetadata remote: d2b0410d4da0 tofillmetadata
Make sure background process finished Make sure background process finished
$ sleep 3 $ sleep 3
$ cd ../repo $ cd ../repo
$ cat .hg/scratchbranches/index/nodemetadatamap/d2b0410d4da084bc534b1d90df0de9eb21583496 $ cat .hg/scratchbranches/index/nodemetadatamap/d2b0410d4da084bc534b1d90df0de9eb21583496
{"changed_files": {"tofillmetadata": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol) {"changed_files": {"tofillmetadata": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol)