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

Merge project with maintained version #133

Open
wants to merge 32 commits into
base: master
Choose a base branch
from

Commits on May 25, 2018

  1. Refactored gitstatus.py

    - Implement possible fix for git 2.17 issue with string case. Suggested
    a better fix for later.
    - Implemented python stashed support. Is this in Haskell version? Will
    have to check.
    - Reorganized zshrc.sh to be a bit clearer. Few changes such as theme
    and formatting to align with bash-git-prompt.
    - Small tidy up to the README.
    starcraftman committed May 25, 2018
    Configuration menu
    Copy the full SHA
    f166fba View commit details
    Browse the repository at this point in the history
  2. FIX: #1 See pcmd_error TODO

    - All commands checked for bad return. No longer need stderr connected.
    starcraftman committed May 25, 2018
    Configuration menu
    Copy the full SHA
    56f0358 View commit details
    Browse the repository at this point in the history
  3. FIX: Prompt was not displaying.

    - Issue was a simple typo in zshrc.sh
    - Revert gitstatus.py to printing on line.
    starcraftman committed May 25, 2018
    Configuration menu
    Copy the full SHA
    684d615 View commit details
    Browse the repository at this point in the history
  4. FIX: Regression, unhandled exception.

    - Really need to get some tests to help cover this.
    starcraftman committed May 25, 2018
    Configuration menu
    Copy the full SHA
    3a5dec4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    dca58dc View commit details
    Browse the repository at this point in the history
  6. Ooops, typo.

    starcraftman committed May 25, 2018
    Configuration menu
    Copy the full SHA
    7e86fd8 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2018

  1. FIX: #6 Examine compute_ahead_behind, discrepancy

    - Simple logic problem was the root.
    - Update gitignore, mainly usual python test dirs and stack's dirs.
    starcraftman committed May 26, 2018
    Configuration menu
    Copy the full SHA
    e245593 View commit details
    Browse the repository at this point in the history
  2. Basic tox configuration to test gitstatus.py

    - Will check for style issues and run unit tests.
    starcraftman committed May 26, 2018
    Configuration menu
    Copy the full SHA
    ee1c4c3 View commit details
    Browse the repository at this point in the history
  3. Initial basic set of tests.

    - FIX: Prompt was not showing when detached HEAD.
    - BUG: pytest fails from tox, will investigate.
    starcraftman committed May 26, 2018
    Configuration menu
    Copy the full SHA
    7d138e9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3e6db1a View commit details
    Browse the repository at this point in the history

Commits on May 27, 2018

  1. FIX: Tests work in tox.

    - Tox env has no configured user information.
    - Generate work folders from tempfile.
    starcraftman committed May 27, 2018
    Configuration menu
    Copy the full SHA
    3269438 View commit details
    Browse the repository at this point in the history
  2. Implement travis build for python

    - Test on 2.7, 3.4, 3.5, 3.6.
    - 3.2, 3.3 should work but getting excessive.
    - 2.6.x and 3.1.x are unsupported based on code at this time.
    starcraftman committed May 27, 2018
    Configuration menu
    Copy the full SHA
    a877603 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f78f234 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. FIX: #3 Show [master L] when branch local only.

    - Simple suffix to branch name. Will appear if detached is local too.
    - Travis locked to master build.
    starcraftman committed May 28, 2018
    Configuration menu
    Copy the full SHA
    4766cdf View commit details
    Browse the repository at this point in the history
  2. FIX: #7 Change compute_stats

     - Remove all need for commands except for: git status --branch
     --porcelain
     - Parse porcelain capture status for repo's staged/unstaged changes.
     - Parse porcelain capture for difference from remote if set.
     - Fetch stash number and hash directly from files in .git
     - Now parsing upstream name, can be set on prompt at later date when
     changes facilitate.
    starcraftman committed May 28, 2018
    Configuration menu
    Copy the full SHA
    10d8a9c View commit details
    Browse the repository at this point in the history
  3. Better separation of funcs.

    - Notes for future improvements.
    starcraftman committed May 28, 2018
    Configuration menu
    Copy the full SHA
    e93f615 View commit details
    Browse the repository at this point in the history
  4. FIX: #12 Speedup by taking input from STDIN

    - When no stdin detected, fallback to running own command.
    starcraftman committed May 28, 2018
    Configuration menu
    Copy the full SHA
    fba5070 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6fda93e View commit details
    Browse the repository at this point in the history

Commits on May 29, 2018

  1. Configuration menu
    Copy the full SHA
    6e401d9 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. Partial fix.

    starcraftman committed May 30, 2018
    Configuration menu
    Copy the full SHA
    bd26fbb View commit details
    Browse the repository at this point in the history
  2. FIX: #13 Find root of active git project

    - Script aware now if in worktree or not, no visual difference in prompt
    at this point.
    starcraftman committed May 30, 2018
    Configuration menu
    Copy the full SHA
    87774a8 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. FIX: #4 Allow opt-in to show upstream

    - Typo in zshrc.sh
    starcraftman committed May 31, 2018
    Configuration menu
    Copy the full SHA
    2b1069b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f2ca95e View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2018

  1. Configuration menu
    Copy the full SHA
    c6f3567 View commit details
    Browse the repository at this point in the history
  2. Fork note.

    starcraftman committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    814dc53 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. FIX #16: Reset color in prefix

    - Ensure consistent colouring by using resets around output.
    starcraftman committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    e02d4b1 View commit details
    Browse the repository at this point in the history
  2. FIX #17: handle repo lacking initial commit

    - Increase function purity by reducing global usage.
    starcraftman committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    4e45c4f View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Configuration menu
    Copy the full SHA
    bec2226 View commit details
    Browse the repository at this point in the history
  2. FIX #11: When merging indicate in prompt

    - Overhaul of tests. Clearly separate functional and integration tests.
    - git_paths now resolves possible merge_file and rebase_dir, not
    guaranteed to exist.
    - Update README to show all possible branch states, including merging and
    rebase now added.
    starcraftman committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    fab5894 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7bb9ea5 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2018

  1. FIX #21: Fix order of gitstatus.py & zshrc.sh

    - Clarify diverge test, different numbers.
    starcraftman committed Jun 16, 2018
    Configuration menu
    Copy the full SHA
    f704934 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11b83ba View commit details
    Browse the repository at this point in the history