Skip to content

Merge environment and compare environments #14026

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

Merged
Karthik Nadig (karthiknadig) merged 10 commits into from
Sep 28, 2020
Merged

Merge environment and compare environments #14026

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0047176
Add some heuristic functions
karthiknadig Sep 21, 2020
89d7b82
Support merging.
karthiknadig Sep 21, 2020
7d60921
Clean up identifier code
karthiknadig Sep 22, 2020
e1f5d65
Tweaks and fixes
karthiknadig Sep 22, 2020
a4f8a9d
More clean up.
karthiknadig Sep 22, 2020
a4392e5
versions tweak
karthiknadig Sep 24, 2020
6a3838f
Address comments
karthiknadig Sep 25, 2020
4cdfcb0
more comments
karthiknadig Sep 28, 2020
e40f8de
Fix merge issues.
karthiknadig Sep 28, 2020
ecae324
Fix more merge issues.
karthiknadig Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix merge issues.
  • Loading branch information
@karthiknadig
karthiknadig committed Sep 28, 2020
commit e40f8de2eda6da8e54f385ba3ca1d2df787b2dc6
8 changes: 4 additions & 4 deletions src/client/pythonEnvironments/base/locators/composite/environmentsReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

import { cloneDeep, isEqual } from 'lodash';
import { Event, EventEmitter } from 'vscode';
import { traceVerbose } from '../../common/logger';
import { createDeferred } from '../../common/utils/async';
import { PythonEnvInfo, PythonEnvKind } from '../base/info';
import { areSameEnvironment } from '../base/info/env';
import { traceVerbose } from '../../../../common/logger';
import { createDeferred } from '../../../../common/utils/async';
import { PythonEnvInfo, PythonEnvKind } from '../../info';
import { areSameEnvironment } from '../../info/env';
import {
ILocator, IPythonEnvsIterator, PythonEnvUpdatedEvent, PythonLocatorQuery,
} from '../../locator';
Expand Down