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.

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

Support Cygwin's Git on Windows #533

Merged
merged 14 commits into from Oct 22, 2016
Merged

Conversation

@ankostis
Copy link
Contributor

@ankostis ankostis commented Oct 14, 2016

Appveyor Cygwin TC failures

Reporting changes in the Appvayor cygwin-combination bottom-line for significant commits, in reverse chronological order:

  • 5962373: cygwin, appveyor, #533: Enable actual failures, hide certain 2+2 cases
    • PY2: skip: 12
    • PY3: skip: 16
  • b2efa1b: cygwin, #533: FIX submodules detection (~10TCs fixed)
    • PY2: err: 2, fail: 1
    • PY3: err: 2, fail: 1
  • 9afebf67: cygwin, #533: FIX submodules detection (~10TCs fixed)
    • PY2: err: 2, fail: 2
    • PY3: err: 2, fail: 2
  • a2d248b: cygwin, #533: polish abs-paths in git add commands
    • PY2: err: 12, fail: 2
    • PY3: err: 11, fail: 2
  • 3b1cfcc: cygwin, #525: Allow '/cygdrive/c/' paths on repo init
    • PY2: err: 13, fail: 2
    • PY3: err: 12, fail: 2
  • 57d0537: cygwin, #525: Polish also --git-separate-dir
    • PY2: err: 13, fail: 3
    • PY3: err: 12, fail: 3
  • 0bce7cc: cygwin, #525: FIX daemon launching
    • PY2: err: 13, fail: 3
    • PY3: err: 12, fail: 3
  • e6e23ed: cygwin, #525: Try to make it work with Cygwin's Git.
    • PY2: err: 14, fail: 3
    • PY3: err: 13, fail: 3
  • ba7c2a0: appveyor, #525: enable CYGWIN TCs without failing (START: no Cygwin specific code)
    • PY2: err: 44, fail: 0
    • PY3: err: 13, fail: 0
ankostis added 5 commits Oct 13, 2016
- Cygwin TCs failing (start, no Cygwin specific code):
  - PY2: err: 44, fail: 0
  - PY3: err: 13, fail: 0
+ Make `Git.polish_url()` convert paths into Cygwin-friendly paths.
+ Add utility and soe TCs for funcs for detecting cygwin and converting
abs-paths to `/cygdrive/c/...`.
- Cygwin TCs failing:
  - PY2: err: 14, fail: 3
  - PY3: err: 13, fail: 3
+ Rework git-daemon launching with `with` resource-management.
+ cmd: add `is_cygwin` optional override kwd on `Git.polish_url()`.
- Cygwin TCs failing:
  - PY2: err: 13, fail: 3
  - PY3: err: 12, fail: 3
- Cygwin TCs failing:
  - PY2: err: 13, fail: 3
  - PY3: err: 12, fail: 3
- Cygwin TCs failing:
  - PY2: err: 13, fail: 2
  - PY3: err: 12, fail: 2
@Byron Byron added the in progress label Oct 14, 2016
@codecov-io
Copy link

@codecov-io codecov-io commented Oct 14, 2016

Current coverage is 94.33% (diff: 93.65%)

Merging #533 into master will decrease coverage by 0.08%

@@             master       #533   diff @@
==========================================
  Files            63         63          
  Lines          9736       9872   +136   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits           9193       9313   +120   
- Misses          543        559    +16   
  Partials          0          0          

Powered by Codecov. Last update 9e4a454...cc77e6b

ankostis added a commit to ankostis/GitPython that referenced this pull request Oct 14, 2016
+ Modify TCs - no main-code changes.
+ FIXed:
  + `TestSubmodule.test_git_submodules_and_add_sm_with_new_commit()`
  + TestDiff.test_diff_with_staged_file()
  
- Cygwin TCs failing:
  - PY2: err: 11, fail: 2
  - PY3: err: 10, fail: 2
@ankostis ankostis self-assigned this Oct 15, 2016
@ankostis ankostis added this to the v2.1.0 - proper windows support milestone Oct 15, 2016
@ankostis ankostis force-pushed the ankostis:cygwin branch from d8fc2e4 to efbedff Oct 16, 2016
ankostis added a commit to ankostis/GitPython that referenced this pull request Oct 16, 2016
+ Decygpath sm's `.git` file contents.
ankostis added 4 commits Oct 14, 2016
+ Modify TCs - no main-code changes.
+ FIXed:
  + `TestSubmodule.test_git_submodules_and_add_sm_with_new_commit()`
  + TestDiff.test_diff_with_staged_file()

- Cygwin TCs failing:
  - PY2: err: 12, fail: 2
  - PY3: err: 11, fail: 2
@ankostis ankostis force-pushed the ankostis:cygwin branch from efbedff to 997ea34 Oct 16, 2016
ankostis added a commit to ankostis/GitPython that referenced this pull request Oct 16, 2016
…xed)

+ Decygpath sm's `.git` file contents.

- Cygwin TCs failing:
  - PY2: err: 2, fail: 2
  - PY3: err: 2, fail: 2
ankostis added 2 commits Oct 16, 2016
+ Decygpath sm's `.git` file contents.
+ Polish another path in `git add`; actually no main-code changes, just
a replace \-->/ on a relative(!) path to make cygwin-git to work.

- REGRESSION `test_git_submodules_and_add_sm_with_new_commit` asks for
user/email settings.

- Cygwin TCs failing:
  - PY2: err: 2, fail: 1
  - PY3: err: 2, fail: 1
ankostis added a commit to ankostis/GitPython that referenced this pull request Oct 16, 2016
…ide certain 2+2 cases
ankostis added a commit to ankostis/GitPython that referenced this pull request Oct 16, 2016
…ide certain 2+2 cases
ankostis added a commit to ankostis/GitPython that referenced this pull request Oct 16, 2016
…ide certain 2+2 cases
@ankostis ankostis force-pushed the ankostis:cygwin branch from 997ea34 to 5962373 Oct 16, 2016
@ankostis
Copy link
Contributor Author

@ankostis ankostis commented Oct 16, 2016

@Byron you may merge this one, I'm done with Windows, and franky I'm exhausted.
The CHANGES for a "Windows" version are summarized in the OPs of #519, #525 and this issue.

I would appreciate if you tried to make an even better summary and add them into CHANGES, to get an overview of my changes needed for making Windows work.

@Byron Byron merged commit cc77e6b into gitpython-developers:master Oct 22, 2016
2 of 4 checks passed
2 of 4 checks passed
codecov/patch 93.65% of diff hit (target 94.42%)
Details
codecov/project 94.33% (-0.09%) compared to 9e4a454
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Byron Byron removed the in progress label Oct 22, 2016
@Byron
Copy link
Member

@Byron Byron commented Oct 22, 2016

@ankostis Thanks for the hint ! I just pushed the merge-commit, bringing in all the goodness you have been working on. Thanks so much for all the work you put in, GitPython is so much better now.
I will go ahead and try to make the summary for the changes.rst file.

@Byron
Copy link
Member

@Byron Byron commented Oct 22, 2016

A new release was made. As I felt incapable of summing up the details of the changes concisely, except for general bits about unicode handling and context managers. Thus I ended up praising you, and linked to the respective milestone, hoping that this is alright with you :).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.