Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement Lanes and Snaps features #2754

Merged
merged 183 commits into from Jul 17, 2020
Merged

Implement Lanes and Snaps features #2754

merged 183 commits into from Jul 17, 2020

Commits on Oct 24, 2019

  1. (wip) start working on bit-snap

    @davidfirst
    davidfirst committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    0f522d1 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. disconnect the hash calculation of a Version object from its path, it… 

    … helps to be flexible with schema changes and avoid HashMismatch exceptions
    @davidfirst
    davidfirst committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    f4dfa8c View commit details
    Browse the repository at this point in the history

  2. (wip) continue working on bit-snap. bit snap command is working, but … 

    …everything after that is broken
    @davidfirst
    davidfirst committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    de27c6e View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. snap and tag are working in conjunction

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    9502a06 View commit details
    Browse the repository at this point in the history

  2. snap - have head snap as Ref in memory

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    48698f2 View commit details
    Browse the repository at this point in the history

  3. fix tests

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    2999fe3 View commit details
    Browse the repository at this point in the history

  4. fix bit status

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    b95e948 View commit details
    Browse the repository at this point in the history

  5. add e2e-tests

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    6e7aba6 View commit details
    Browse the repository at this point in the history

  6. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    8a1bc14 View commit details
    Browse the repository at this point in the history

  7. fix lint issues

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    18e94e0 View commit details
    Browse the repository at this point in the history

  8. fix modified status after snap

    @davidfirst
    davidfirst committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    f7790b5 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. change parent hash prop if version hash is changed

    @davidfirst
    davidfirst committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    394fe19 View commit details
    Browse the repository at this point in the history

  2. change parent prop to be an array of parents

    @davidfirst
    davidfirst committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    492c3c1 View commit details
    Browse the repository at this point in the history

  3. fix conflicts

    @davidfirst
    davidfirst committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    9043e17 View commit details
    Browse the repository at this point in the history

  4. fix unit tests

    @davidfirst
    davidfirst committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    042c376 View commit details
    Browse the repository at this point in the history

  5. fix tests

    @davidfirst
    davidfirst committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    1a26ef6 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. fix snap head upon untag

    @davidfirst
    davidfirst committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    bb940d6 View commit details
    Browse the repository at this point in the history

  2. fix untag for snaps

    @davidfirst
    davidfirst committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    b797099 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    eb36c4c View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. provide a more descriptive error message when a hash is missing

    @davidfirst
    davidfirst committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    6006c53 View commit details
    Browse the repository at this point in the history

  2. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    92b215d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    fb47a35 View commit details
    Browse the repository at this point in the history

  4. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    eb62b91 View commit details
    Browse the repository at this point in the history

  5. avoid fetching all versions when not needed

    @davidfirst
    davidfirst committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    55082c8 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. fix bug of second tag after snap

    @davidfirst
    davidfirst committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    3f87d81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    3410bed View commit details
    Browse the repository at this point in the history

  3. fix import

    @davidfirst
    davidfirst committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    703313e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. fix bit-log to show snaps. support diverged snaps history. fix import… 

    … and export of snaps. write remote head to a new file at refs/remote
    @davidfirst
    davidfirst committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    4d0236f View commit details
    Browse the repository at this point in the history

  2. fix lint issues

    @davidfirst
    davidfirst committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    f51a626 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. fix tests

    @davidfirst
    davidfirst committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b42d1a6 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @davidfirst
    davidfirst committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    77b2059 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. fix conflicts

    @davidfirst
    davidfirst committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    14cd1ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    f2f55c2 View commit details
    Browse the repository at this point in the history

  3. fix tests after merge from master

    @davidfirst
    davidfirst committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    d379d0e View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    0a191c9 View commit details
    Browse the repository at this point in the history

  2. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    cb72ee2 View commit details
    Browse the repository at this point in the history

  3. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    f621395 View commit details
    Browse the repository at this point in the history

  4. implement import --object when the local head is different than the r… 

    …emote head
    @davidfirst
    davidfirst committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    0f36949 View commit details
    Browse the repository at this point in the history

  5. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    2469856 View commit details
    Browse the repository at this point in the history

  6. fix unit tests

    @davidfirst
    davidfirst committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    45757e4 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    69a1a5d View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. (wip) started working on bit lane command

    @davidfirst
    davidfirst committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    dd20bb1 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    43d7c8e View commit details
    Browse the repository at this point in the history

  2. minor fixes

    @davidfirst
    davidfirst committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    452dffe View commit details
    Browse the repository at this point in the history

  3. revert the implementation of saving different "Component" objects per… 

    … lanes (done by dd20bb1)
    @davidfirst
    davidfirst committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    4c68529 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. implement Lane object (inherit BitObject)

    @davidfirst
    davidfirst committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    b23f476 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2019

  1. add missing files

    @davidfirst
    davidfirst committed Nov 23, 2019
    Configuration menu
    Copy the full SHA
    ac3e226 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. fix e2e-tests

    @davidfirst
    davidfirst committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    d0f6d9e View commit details
    Browse the repository at this point in the history

  2. fix errors, get "bit lane --components" work again

    @davidfirst
    davidfirst committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    b248724 View commit details
    Browse the repository at this point in the history

  3. add basic validation for "lane" object, introduce "bit cat-lane" comm… 

    …and, fix "bit status" when snapping on master then on a new lane
    @davidfirst
    davidfirst committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    e0e8472 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. fix lint and e2e-tests, remove scope-name from lane-id

    @davidfirst
    davidfirst committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    50efd46 View commit details
    Browse the repository at this point in the history

  2. fix bit diff to work with snaps

    @davidfirst
    davidfirst committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    40274a3 View commit details
    Browse the repository at this point in the history

  3. bit checkout is working for Snaps

    @davidfirst
    davidfirst committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    7160588 View commit details
    Browse the repository at this point in the history

  4. add tests for bit merge with snaps

    @davidfirst
    davidfirst committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    fe6f41b View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. recognize diverged components, suggest to merge them in bit status an… 

    …d throw error on bit import in case --merge was not entered
    @davidfirst
    davidfirst committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    6855262 View commit details
    Browse the repository at this point in the history

  2. fix tsc errors

    @davidfirst
    davidfirst committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    51a626e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    d0d88ce View commit details
    Browse the repository at this point in the history

  4. fix tests

    @davidfirst
    davidfirst committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    9d3e3fd View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

  1. fix unit tests

    @davidfirst
    davidfirst committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    109568d View commit details
    Browse the repository at this point in the history

  2. fix status of merge-pending to show the number of snaps existing on l… 

    …ocal/remote
    @davidfirst
    davidfirst committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    1fa2ac0 View commit details
    Browse the repository at this point in the history

  3. add the common snap before diverge data into the diverge results

    @davidfirst
    davidfirst committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    5cfd456 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. implement a snap-merge of diverged components

    @davidfirst
    davidfirst committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    d16ca6f View commit details
    Browse the repository at this point in the history

  2. fix tsc errors

    @davidfirst
    davidfirst committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    9cba88d View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. fix bit-status to show an unresolved component as such, implement bit… 

    … merge --resolve
    @davidfirst
    davidfirst committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    6bb2e25 View commit details
    Browse the repository at this point in the history

  2. implement merge --abort

    @davidfirst
    davidfirst committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    3a55d36 View commit details
    Browse the repository at this point in the history

  3. fix e2e-tests

    @davidfirst
    davidfirst committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    a48a58c View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. prevent tag/snap/checkout/merge a component with conflicts, enable un… 

    …tag/remove
    @davidfirst
    davidfirst committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    6353a8e View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. basic lane export is working

    @davidfirst
    davidfirst committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    3ea36b4 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. fix e2e-tests and lint

    @davidfirst
    davidfirst committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    4b3d90d View commit details
    Browse the repository at this point in the history

  2. fix tests

    @davidfirst
    davidfirst committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    3e882b3 View commit details
    Browse the repository at this point in the history

  3. fix conflicts after merging master into feature/snap

    @davidfirst
    davidfirst committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    d1fdede View commit details
    Browse the repository at this point in the history

  4. write exported components heads into refs/remote

    @davidfirst
    davidfirst committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    daebaf5 View commit details
    Browse the repository at this point in the history

  5. minor fix

    @davidfirst
    davidfirst committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    aa7ed41 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. started implementing "bit import" lanes

    @davidfirst
    davidfirst committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    fb0c997 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. fix tests

    @davidfirst
    davidfirst committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    6831e93 View commit details
    Browse the repository at this point in the history

  2. move current-local-name from .bitmap to scope.json

    @davidfirst
    davidfirst committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    e6c90de View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. basic funtionality of switching between master to a lane is working

    @davidfirst
    davidfirst committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    a23c678 View commit details
    Browse the repository at this point in the history

  2. fix e2e-tests

    @davidfirst
    davidfirst committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    0dd907a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. fix tsc errors

    @davidfirst
    davidfirst committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    b499822 View commit details
    Browse the repository at this point in the history

  2. add test for "bit diff" when on a lane, fix "bit status" when snapped… 

    … on a lane, refactor "diverge" data
    @davidfirst
    davidfirst committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    1e1fd05 View commit details
    Browse the repository at this point in the history

  3. started working on "bit merge" for lanes. fix tag & checkout lane for… 

    … multiple components
    @davidfirst
    davidfirst committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    ac48912 View commit details
    Browse the repository at this point in the history

  4. fix e2e-tests

    @davidfirst
    davidfirst committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    b0c38ad View commit details
    Browse the repository at this point in the history

  5. fix tests, fix exporting from master to write the snaps into the remo… 

    …te ref
    @davidfirst
    davidfirst committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    6507505 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2019

  1. fix e2e-tests

    @davidfirst
    davidfirst committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    da65fd5 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2019

  1. basic "bit merge" of lanes is working

    @davidfirst
    davidfirst committed Dec 25, 2019
    Configuration menu
    Copy the full SHA
    bbd93e6 View commit details
    Browse the repository at this point in the history

  2. fix merging from a remote lane into master

    @davidfirst
    davidfirst committed Dec 25, 2019
    Configuration menu
    Copy the full SHA
    f7953bc View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2019

  1. fix e2e-test

    @davidfirst
    davidfirst committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    a56fd08 View commit details
    Browse the repository at this point in the history

  2. start working on noSnap flag

    @davidfirst
    davidfirst committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    8d08375 View commit details
    Browse the repository at this point in the history

  3. rename snap-merge to merge-snaps

    @davidfirst
    davidfirst committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    01b3d86 View commit details
    Browse the repository at this point in the history

  4. consolidating merge-lanes with snap-merge logic. add merge-snaps output

    @davidfirst
    davidfirst committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    1882ed6 View commit details
    Browse the repository at this point in the history

  5. implement --no-snap and --message flags of bit-merge

    @davidfirst
    davidfirst committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    3bf980e View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2019

  1. add existingOnWorkspaceOnly flag for bit-merge

    @davidfirst
    davidfirst committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    a0d86e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    0b39071 View commit details
    Browse the repository at this point in the history

  3. add e2e-test and output when using --existing flag for bit-merge

    @davidfirst
    davidfirst committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    34f2f28 View commit details
    Browse the repository at this point in the history

  4. implement bit lane --merge and --not-merged flags

    @davidfirst
    davidfirst committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    5a9317b View commit details
    Browse the repository at this point in the history

  5. add a flag "new-lane-name" for bit-checkout

    @davidfirst
    davidfirst committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    deed9d6 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2019

  1. introduce new flags for "bit import": --new-lane-name and --checkout

    @davidfirst
    davidfirst committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    55f4a0a View commit details
    Browse the repository at this point in the history

  2. fix e2e-tests

    @davidfirst
    davidfirst committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    273ef05 View commit details
    Browse the repository at this point in the history

  3. fix conflicts after merging from master

    @davidfirst
    davidfirst committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    7ae128b View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2020

  1. copy components data from origin lane to a newly created lane (except… 

    … master)
    @davidfirst
    davidfirst committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    5f28a35 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2020

  1. fix conflicts after merging master

    @davidfirst
    davidfirst committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    1f9da59 View commit details
    Browse the repository at this point in the history

  2. introduce "bit switch" to switch/create/import lanes

    @davidfirst
    davidfirst committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    34bb75d View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. introduce "bit fetch" command to fetch remote objects

    @davidfirst
    davidfirst committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    014a42b View commit details
    Browse the repository at this point in the history

  2. improve lane-id

    @davidfirst
    davidfirst committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    f283adb View commit details
    Browse the repository at this point in the history

  3. bit fetch is working, change tests to work with bit-switch and bit-fetch

    @davidfirst
    davidfirst committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    f10429a View commit details
    Browse the repository at this point in the history

  4. fix lint issues

    @davidfirst
    davidfirst committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    b4d354e View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2020

  1. fix e2e-tests on Windows

    @davidfirst
    davidfirst committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    4edac93 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. basic case of switching from a lane back to master is working

    @davidfirst
    davidfirst committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    05c3243 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. basic case of importing a component when checked out to a lane

    @davidfirst
    davidfirst committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    f888e3d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. change bit-lane to function only as list/show not as "add". change th… 

    …e output according to the new specs
    @davidfirst
    davidfirst committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    277b942 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    5ceef4b View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. started working on workspace-lanes

    @davidfirst
    davidfirst committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    f95d82c View commit details
    Browse the repository at this point in the history

  2. fix conflicts after merging from master

    @davidfirst
    davidfirst committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    4f0dfc6 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. implement workspace-lane object to save the current (checked out) ver… 

    …sions per local lane
    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    0654258 View commit details
    Browse the repository at this point in the history

  2. fix lint issues

    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    22d937d View commit details
    Browse the repository at this point in the history

  3. export with no ids when checked out to a lane, exports the lane

    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    1662f71 View commit details
    Browse the repository at this point in the history

  4. change the export output to indicate that lanes were exported

    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    23727e5 View commit details
    Browse the repository at this point in the history

  5. fix some more bugs

    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    b926dc1 View commit details
    Browse the repository at this point in the history

  6. separate getAllBitIds and getAllIdsAvailableOnLane methods to not use… 

    … the same cache
    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    206b400 View commit details
    Browse the repository at this point in the history

  7. implement remove local lanes

    @davidfirst
    davidfirst committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    ae25217 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. refactoring: extract lanes code from scope into a new class Lanes

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    8026e28 View commit details
    Browse the repository at this point in the history

  2. enable fetching lane list from a remote

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    514d638 View commit details
    Browse the repository at this point in the history

  3. add missing files

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    c088382 View commit details
    Browse the repository at this point in the history

  4. fix unit tests

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    6d115c0 View commit details
    Browse the repository at this point in the history

  5. rename ObjectsToPush class to CompsAndLanesObjects

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    09c12aa View commit details
    Browse the repository at this point in the history

  6. rename objects-to-push.ts file to comps-and-lanes-objects.ts

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    5e61c73 View commit details
    Browse the repository at this point in the history

  7. fix paths after the rename

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    aedd015 View commit details
    Browse the repository at this point in the history

  8. when user is checked out to a lane, "bit remove" removes the componen… 

    …t from the lane only
    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    f2d9180 View commit details
    Browse the repository at this point in the history

  9. fix types

    @davidfirst
    davidfirst committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    6e2b4dd View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2020

  1. enable removing remote lanes

    @davidfirst
    davidfirst committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    5f58a42 View commit details
    Browse the repository at this point in the history

  2. add missing files

    @davidfirst
    davidfirst committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    920cc2f View commit details
    Browse the repository at this point in the history

  3. block tagging when on a lane for now. we might change it later

    @davidfirst
    davidfirst committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    ae58b3a View commit details
    Browse the repository at this point in the history

  4. fix lints

    @davidfirst
    davidfirst committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    63e7aa1 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. implement auto-snap

    @davidfirst
    davidfirst committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    212d01b View commit details
    Browse the repository at this point in the history

  2. trying to see what breaks when fetching all parents recursively

    @davidfirst
    davidfirst committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    f658bc9 View commit details
    Browse the repository at this point in the history

  3. fix tests

    @davidfirst
    davidfirst committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    a49f559 View commit details
    Browse the repository at this point in the history

  4. skip a test about fetching dependencies parents for now, it will be b… 

    …ack once the backward compatibility is implemented
    @davidfirst
    davidfirst committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    c94321a View commit details
    Browse the repository at this point in the history

  5. implement auto-snap on lanes

    @davidfirst
    davidfirst committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    c6c2357 View commit details
    Browse the repository at this point in the history

  6. fix ModelComponent.latest() to always work with the current lane

    @davidfirst
    davidfirst committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    afe48b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2020

  1. skip an e2e-test for now until backward compatibility is implemented

    @davidfirst
    davidfirst committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    9af8538 View commit details
    Browse the repository at this point in the history

  2. support feature-toggle mechanism

    @davidfirst
    davidfirst committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    526d62a View commit details
    Browse the repository at this point in the history

  3. backward compatibility: do not save snaps.head and component parents … 

    …when lane feature is disabled
    @davidfirst
    davidfirst committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    7952e6c View commit details
    Browse the repository at this point in the history

  4. backward compatibility - fix import from old clients

    @davidfirst
    davidfirst committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    8d4cf12 View commit details
    Browse the repository at this point in the history

  5. throw errors when trying to use lanes/snaps and the feature is disabled

    @davidfirst
    davidfirst committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    238ebf6 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. lint issues

    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    1f76690 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/snap

    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    1bd5421 View commit details
    Browse the repository at this point in the history

  3. re-enable some tests now that backward compatibility is supported

    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    c0d5300 View commit details
    Browse the repository at this point in the history

  4. extract create-lane functionality to a new file

    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    e40f02d View commit details
    Browse the repository at this point in the history

  5. extract export-lanes functionality to a new file

    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    f4e2416 View commit details
    Browse the repository at this point in the history

  6. refactoring. make sure fetch api gets bit-ids or remote-lane-ids. (re… 

    …move the hack of converting lane-id into bit-id)
    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    f0b47c7 View commit details
    Browse the repository at this point in the history

  7. fix lint

    @davidfirst
    davidfirst committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    3491f52 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. clean some unneeded flags on checkout command

    @davidfirst
    davidfirst committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    5330dd7 View commit details
    Browse the repository at this point in the history

  2. fix MergeConflictOnRemote to be backward compatible

    @davidfirst
    davidfirst committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    2a44293 View commit details
    Browse the repository at this point in the history

  3. refactoring and mark lane flags as experimental

    @davidfirst
    davidfirst committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    d837624 View commit details
    Browse the repository at this point in the history

  4. more refactoring

    @davidfirst
    davidfirst committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    fd99c11 View commit details
    Browse the repository at this point in the history

  5. remove some dups snap/tag

    @davidfirst
    davidfirst committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    515df76 View commit details
    Browse the repository at this point in the history

  6. fix lint issues

    @davidfirst
    davidfirst committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    f4e43b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2020

  1. extract switch lane logic from checkout-version.ts to switch-lanes.ts

    @davidfirst
    davidfirst committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    7aacbf4 View commit details
    Browse the repository at this point in the history

  2. consolidate snap-model-component into tag-model-component

    @davidfirst
    davidfirst committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    fd386a2 View commit details
    Browse the repository at this point in the history

  3. fix Windows tests

    @davidfirst
    davidfirst committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    8758091 View commit details
    Browse the repository at this point in the history

  4. clear confusion between remoteHead and laneHeadRemote

    @davidfirst
    davidfirst committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    70f5968 View commit details
    Browse the repository at this point in the history

  5. extract merge-lanes code to a new file merge-lanes.ts, refactor Remot… 

    …eLane to use RemoteLaneId whenever possible
    @davidfirst
    davidfirst committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    b34648f View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2020

  1. extract the diverge-data into a new file, add a new prop "remoteHead"… 

    … and avoid adding the master remote into laneRemoteHead
    @davidfirst
    davidfirst committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    a3ffb31 View commit details
    Browse the repository at this point in the history

  2. extract the logic of version traversal into a new file

    @davidfirst
    davidfirst committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    db47807 View commit details
    Browse the repository at this point in the history

  3. remove the hack of reseting the model-component heads

    @davidfirst
    davidfirst committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    beeeb16 View commit details
    Browse the repository at this point in the history

  4. fix some forward compatibility issues with index.json

    @davidfirst
    davidfirst committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    3ef264c View commit details
    Browse the repository at this point in the history

  5. fix RemoteLaneId to indicate that a scope is mandatory

    @davidfirst
    davidfirst committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    0bf1488 View commit details
    Browse the repository at this point in the history

  6. change ModelComponent.snaps.head to ModelComponent.head

    @davidfirst
    davidfirst committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    9506073 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2020

  1. fix bug when merging components to master

    @davidfirst
    davidfirst committed Jan 25, 2020
    Configuration menu
    Copy the full SHA
    bd05574 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2020

  1. change variables with snapHead to head

    @davidfirst
    davidfirst committed Jan 27, 2020
    Configuration menu
    Copy the full SHA
    319c235 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. fix conflicts after merging master to lanes

    @davidfirst
    davidfirst committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    51a7284 View commit details
    Browse the repository at this point in the history

  2. fix e2e-tests

    @davidfirst
    davidfirst committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    a5ff822 View commit details
    Browse the repository at this point in the history

  3. fix tests

    @davidfirst
    davidfirst committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    12f7596 View commit details
    Browse the repository at this point in the history

  4. fix e2e-tests

    @davidfirst
    davidfirst committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    a0e14fc View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. fix e2e-tests

    @davidfirst
    davidfirst committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    91b4a4c View commit details
    Browse the repository at this point in the history

  2. fix unit tests

    @davidfirst
    davidfirst committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    37822a4 View commit details
    Browse the repository at this point in the history

  3. fix e2e-tests

    @davidfirst
    davidfirst committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    7e0a476 View commit details
    Browse the repository at this point in the history

  4. fix lint errors

    @davidfirst
    davidfirst committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    efade59 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. bump version

    @GiladShoham
    GiladShoham committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    4eb230b View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. fix conflicts after merging from master

    @davidfirst
    davidfirst committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    4605600 View commit details
    Browse the repository at this point in the history

  2. fix package-lock.json conflicts

    @davidfirst
    davidfirst committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    d35c5fb View commit details
    Browse the repository at this point in the history

  3. fix tests

    @davidfirst
    davidfirst committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    803f79d View commit details
    Browse the repository at this point in the history

  4. revert the package-lock.json to be the same as master

    @davidfirst
    davidfirst committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    3520677 View commit details
    Browse the repository at this point in the history