Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rowanj/gitx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: aneeshd/gitx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 11 files changed
  • 2 contributors

Commits on Dec 25, 2014

  1. Nicer style for the "long diff" message

    Conflicts:
    	MGScopeBar
    kelan authored and Aneesh Dalvi committed Dec 25, 2014
    Configuration menu
    Copy the full SHA
    e912e44 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2014

  1. Add diffstat info to the list of files in the commit view

    Visual changes:
    * Use a more structured table layout for the list of files.
    
    Obj-C Code changes:
    * Load the diffstat info with:
          $ git show --numstat -M --summary --pretty=raw $REV
      and then (as a 2nd, separate NSTask) load the full diff, with:
          $ git show --pretty=raw -M --no-color $REV
    * A side-effect of this is that you now get a list of files changed in a
      merge commit, whereas it used to only show the commit message.
    
    Javascript/HTML code changes:
    * Get the commit view header info from the first task, so it should load
      quicker, especially for commits with really long diffs.
    * Use the --numstat info (from the output of the first NSTask) to get the
      full list of files changed and the number of changed lines in each, and
      the --summary info to see if any files were created/deleted.
    * Add a "prototype" of the file-list element in index.html, and then have the
      javascript extract then clone that, rather than building the elements
      totally in code.
    * Add javascript functions to show/hide the lines added/removed details when
      the mouse hovers over the lines changed summary.
    
    Conflicts:
    	Classes/Controllers/PBWebHistoryController.m
    	MGScopeBar
    	html/views/history/history.css
    	html/views/history/history.js
    	html/views/history/index.html
    kelan authored and Aneesh Dalvi committed Dec 28, 2014
    Configuration menu
    Copy the full SHA
    caad7cf View commit details
    Browse the repository at this point in the history
  2. Fix contextual menu for files in new filelist

    Also, better handle filenames with spaces
    Conflicts:
    	MGScopeBar
    kelan authored and Aneesh Dalvi committed Dec 28, 2014
    Configuration menu
    Copy the full SHA
    4f25c60 View commit details
    Browse the repository at this point in the history
  3. Tweaked colors in new file list a bit

    * Made the border color match the file diffs.
    * Made the background color lighter and the text
      darker, so it's easier to read (and doesn't have
      the slight look of being disabled that it used
      to have).
    * Changed the text shadow on the file names so it
      doesn't looks weird when overlapping a graph bar.
      In fact, now it helps readability in that case.
    Conflicts:
    	MGScopeBar
    kelan authored and Aneesh Dalvi committed Dec 28, 2014
    Configuration menu
    Copy the full SHA
    4f4bea9 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2014

  1. Configuration menu
    Copy the full SHA
    4abc6c6 View commit details
    Browse the repository at this point in the history
  2. added fullpatch property

    Aneesh Dalvi committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    348366a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8870bf6 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2014

  1. Configuration menu
    Copy the full SHA
    0512cd4 View commit details
    Browse the repository at this point in the history
Loading