[WIP] Merge --ff-only #1

dpordomingo · 2019-04-02T08:03:00Z

depends on src-d#1096

This PR implements the merge --ff-only feature

This PR also:

enhances and cleans command example helpers
prepares the scaffolding for the example command, docs, and all other desired features

TODO:

--ff-only is still incomplete, because it is returned the newer commit, but no ref is updated after the merge as it should be done
test all the current command example options with its expected errors

…end. Fixes src-d#1074 Signed-off-by: Oleksii Shnyra <oleksii@global>

codecov · 2019-04-02T09:47:35Z

Codecov Report

Merging #1 into master will increase coverage by 0.24%.
The diff coverage is 90.6%.

@@            Coverage Diff             @@
##           master       #1      +/-   ##
==========================================
+ Coverage   74.69%   74.93%   +0.24%     
==========================================
  Files         149      151       +2     
  Lines       13222    13403     +181     
==========================================
+ Hits         9876    10044     +168     
- Misses       2248     2256       +8     
- Partials     1098     1103       +5

Impacted Files	Coverage Δ
plumbing/object/commit_walker_bfs_filtered.go	`86.84% <86.84%> (ø)`
plumbing/object/merge_base.go	`93.33% <93.33%> (ø)`
plumbing/object/commit_walker.go	`45.96% <0%> (+1.24%)`	⬆️
plumbing/object/commit_walker_bfs.go	`80% <0%> (+4.44%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 923642a...f31f61a. Read the comment docs.

Signed-off-by: HashedDan <[email protected]>

examples: commit, fixed minor typo in info statement

Signed-off-by: Máximo Cuadros <[email protected]>

plumbing: object, Count stats properly when no new line added at the …

plumbing: commit.StatsContext and fix for root commit

The Decode method was adding one too many newlines to the tag message, causing signature verification to fail. This is because in signed tags produced by `git`, there is a newline after the PGP signature block, resulting in `messageAndSig` having one extra (empty) `[]byte` element. This caused `t.Message` to receive one extra newline. Signed-off-by: Spencer Judd <[email protected]>

…fter signature Signed-off-by: Filip Navara <[email protected]>

Signed-off-by: Filip Navara <[email protected]>

…delta objects Signed-off-by: Filip Navara <[email protected]>

plumbing: object, Fix tag message decoding

Large performance increase by buffering reads. There were a few instances where binary.Read() would end up using reflection on &plumbing.Hash, rather than treating it as a byte slice. This has now been resolved. Signed-off-by: Arran Walker <[email protected]>

Signed-off-by: Filip Navara <[email protected]>

…ting new one Signed-off-by: Filip Navara <[email protected]>

plumbing: idxfile, avoid unnecessary building of reverse offset/hash map

Removes path.Clean and path.Join, as they're expensive in comparison to basic string manipulation that can be used here. Adds bufio.Buffer pool to be used by tag, tree and commit object decoding. Signed-off-by: Arran Walker <[email protected]>

plumbing: TreeWalker performance improvement, bufio pool for objects

This enables interacting with git remotes over SSH when behind a SOCKSv5 firewall. Signed-off-by: Jacob Blain Christen <[email protected]>

ssh: leverage proxy from environment

Signed-off-by: Filip Navara <[email protected]>

plumbing: object, add APIs for traversing over commit graphs

1) lookups on an annotated tag oid now work 2) there was a lot of complexity around detection of ambiguity, but unlike git, ambiguous refs are rejected (which causes bugs like src-d#823). The new code matches rev-parse's behavior (prefer the OID), though there is no warning path to report the same warning. Signed-off-by: Mike Lundy <[email protected]>

improve ResolveRevision's Ref lookup path

Signed-off-by: Linuxer Wang <[email protected]>

Worktree: keep local changes when checkout branch

Signed-off-by: Mike Riley <[email protected]>

Support the 'rebase' config key for branches

Signed-off-by: David Pordomingo <[email protected]>

Create merge-base feature

Signed-off-by: David Pordomingo <[email protected]>

plumbing: object, Count stats properly when no new line added at the …

2a9b544

…end. Fixes src-d#1074 Signed-off-by: Oleksii Shnyra <oleksii@global>

dpordomingo added the enhancement label Apr 2, 2019

dpordomingo self-assigned this Apr 2, 2019

dpordomingo force-pushed the master branch from 13af459 to ab69f58 Compare April 2, 2019 08:03

dpordomingo changed the title ~~Merge~~ [WIP] Merge Apr 2, 2019

dpordomingo changed the title ~~[WIP] Merge~~ [WIP] Merge --ff-only Apr 2, 2019

dpordomingo closed this Apr 2, 2019

dpordomingo reopened this Apr 2, 2019

dpordomingo force-pushed the merge branch from 035d3b5 to 6e8282b Compare April 3, 2019 05:10

dpordomingo force-pushed the master branch from ab69f58 to 923642a Compare April 3, 2019 05:11

dpordomingo force-pushed the merge branch 3 times, most recently from 54a4a96 to 11b19ac Compare April 8, 2019 19:09

hasheddan and others added 16 commits April 15, 2019 14:59

examples: commit, fixed minor typo in info statement

73e0fe9

Signed-off-by: HashedDan <[email protected]>

Merge pull request src-d#1112 from HashedDan/commit-example-typo

829edc9

examples: commit, fixed minor typo in info statement

plumbing: commit.Stat test suite

f69d206

Signed-off-by: Máximo Cuadros <[email protected]>

Merge pull request src-d#1088 from oleksii-shnyra/fix-1074

cc5579e

plumbing: object, Count stats properly when no new line added at the …

plumbing: commit.StatsContext and fix for orphan commit (src-d#1115)

aa6f288

plumbing: commit.StatsContext and fix for root commit

Add test for decoding and verifying signed tags with extra new line a…

612e827

…fter signature Signed-off-by: Filip Navara <[email protected]>

plumbing: idxfile, avoid unnecessary building of reverse offset/hash map

74ae8aa

Signed-off-by: Filip Navara <[email protected]>

plumbing: packfile, apply small object reading optimization also for …

980018a

…delta objects Signed-off-by: Filip Navara <[email protected]>

Merge pull request src-d#1118 from filipnavara/fix1104

e5268e9

plumbing: object, Fix tag message decoding

Update comment

72b97da

Signed-off-by: Filip Navara <[email protected]>

Get the buffer from pool in fillOFSDeltaObjectContent instead of crea…

553fba6

…ting new one Signed-off-by: Filip Navara <[email protected]>

Merge pull request src-d#1119 from filipnavara/idxfile-reverse-index

78092a2

plumbing: idxfile, avoid unnecessary building of reverse offset/hash map

Merge pull request src-d#1125 from saracen/tree-walk-optimization

6d4408a

plumbing: TreeWalker performance improvement, bufio pool for objects

dweomer and others added 17 commits May 2, 2019 12:41

ssh: leverage proxy.Dial

bbc05c7

This enables interacting with git remotes over SSH when behind a SOCKSv5 firewall. Signed-off-by: Jacob Blain Christen <[email protected]>

Merge pull request src-d#1090 from dweomer/ssh-proxy-from-environment

e17ee11

ssh: leverage proxy from environment

Merge remote-tracking branch 'origin/master' into commitgraph-obj

79262fc

Move CommitNode/CommitNodeIndex into separate object/commitgraph package

a661bca

Signed-off-by: Filip Navara <[email protected]>

Fix object/commitgraph tests

940460f

Signed-off-by: Filip Navara <[email protected]>

Add doc.go for commitgraph packages

7d26957

Signed-off-by: Filip Navara <[email protected]>

Add example for commit-graph traversal

944861a

Signed-off-by: Filip Navara <[email protected]>

Add test parameters for ls example

d8471a3

Signed-off-by: Filip Navara <[email protected]>

Allow non-.git path for ls example

0073a49

Signed-off-by: Filip Navara <[email protected]>

Remove unnecessary mmap usage from tests

d2596b8

Signed-off-by: Filip Navara <[email protected]>

Merge pull request src-d#1132 from filipnavara/commitgraph-obj

52fcf7d

plumbing: object, add APIs for traversing over commit graphs

Merge pull request src-d#1146 from novas0x2a/fix-tag-oid

24de5ef

improve ResolveRevision's Ref lookup path

Keep local changes when checkout branch in worktree.

d1e34a7

Signed-off-by: Linuxer Wang <[email protected]>

Merge pull request src-d#1145 from linuxerwang/master

7bdcd80

Worktree: keep local changes when checkout branch

Support the 'rebase' config key for branches

f284cd4

Signed-off-by: Mike Riley <[email protected]>

Merge pull request src-d#1154 from yelirekim/rebase_config

91db86b

Support the 'rebase' config key for branches

dpordomingo force-pushed the merge branch from ccf47bf to 346c504 Compare June 3, 2019 04:21

Create merge-base feature

f62852b

Signed-off-by: David Pordomingo <[email protected]>

dpordomingo force-pushed the merge branch from 346c504 to 18c8fd6 Compare June 3, 2019 11:28

Merge pull request src-d#1097 from dpordomingo/merge-base-core

37b8072

Create merge-base feature

dpordomingo force-pushed the merge branch from 18c8fd6 to 210ff23 Compare June 3, 2019 18:47

dpordomingo added 7 commits June 3, 2019 20:58

Add merge-base command

66c4a36

Signed-off-by: David Pordomingo <[email protected]>

Add merge-base to compatibility table

56af959

Signed-off-by: David Pordomingo <[email protected]>

Use more performant way to calculate if IsAncestor

4d6c3d2

Signed-off-by: David Pordomingo <[email protected]>

Enhance and share command example helpers

0b4f150

Signed-off-by: David Pordomingo <[email protected]>

Add _example/log_local

469da5c

Signed-off-by: David Pordomingo <[email protected]>

wip

3d62195

Signed-off-by: David Pordomingo <[email protected]>

wip2

f31f61a

Signed-off-by: David Pordomingo <[email protected]>

dpordomingo force-pushed the merge branch from 210ff23 to f31f61a Compare June 3, 2019 19:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[WIP] Merge --ff-only #1

[WIP] Merge --ff-only #1

Uh oh!

dpordomingo commented Apr 2, 2019 •

edited

Loading

Uh oh!

codecov bot commented Apr 2, 2019 •

edited

Loading

Uh oh!

Uh oh!

[WIP] Merge --ff-only #1

Are you sure you want to change the base?

[WIP] Merge --ff-only #1

Uh oh!

Conversation

dpordomingo commented Apr 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO:

Uh oh!

codecov bot commented Apr 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

dpordomingo commented Apr 2, 2019 •

edited

Loading

codecov bot commented Apr 2, 2019 •

edited

Loading