Permalink
Commits on Feb 21, 2017
  1. Merge branch 'merge-diff'

    Improve syntax highlighting for conflicted merges.
    
    * merge-diff:
      diffparse: refactor parse()
      diffparse: handle removals performed in a conflict file
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 21, 2017
  2. diffparse: refactor parse()

    Simplify parse() by refactoring the code so that all of the
    local start, count, and current variables are in a
    self-contained Counter object.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 21, 2017
Commits on Feb 20, 2017
  1. diffparse: handle removals performed in a conflict file

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 20, 2017
Commits on Feb 19, 2017
  1. Merge branch 'diff-syntax'

    * diff-syntax:
      diff: support line numbers for unmerged conflict files
      diffparse: support parsing unmerged conflict files
      diffparse: add a merge_value() method
      diff: use the "disabled" color for diff heades
      qtutils: use a simpler rgb() helper for RGB()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  2. diff: support line numbers for unmerged conflict files

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  3. diffparse: support parsing unmerged conflict files

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  4. diffparse: add a merge_value() method

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  5. diff: use the "disabled" color for diff heades

    Make diff "@@" lines less distracting by making them the same disabled
    color as the diff lines.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  6. qtutils: use a simpler rgb() helper for RGB()

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  7. Merge branch 'spellcheck'

    * spellcheck:
      spellcheck: add support for custom dictionaries
      spellcheck: update to the modern dict-common layout
    
    Resolves #663
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  8. spellcheck: add support for custom dictionaries

    Closes #663
    Reported-by: @refaelsh
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
  9. spellcheck: update to the modern dict-common layout

    /usr/share/dict/words is a symlink these days.
    Prefer cracklib-small, which fixes spellcheck on Arch.
    
    Closes #663
    Reported-by: @refaelsh
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 19, 2017
Commits on Feb 14, 2017
  1. doc: update v2.11 release notes draft

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 14, 2017
  2. dag: override fitInView() to eliminate hard-coded margins

    Related-to: https://bugreports.qt.io/browse/QTBUG-42331
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 14, 2017
Commits on Feb 11, 2017
  1. doc: update v2.11 release notes draft

    Closes #662
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 11, 2017
  2. Merge pull request #662 from javierrodriguezcuevas/bug/create_branch_…

    …radiobuttons
    
    * javierrodriguezcuevas/bug/create_branch_radiobuttons:
      fix radios action
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 11, 2017
  3. remote: fix focus for fetch/push/pull

    Closes #661
    Reported-by: Joshua Taylor <joshuataylorx@gmail.com>
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 11, 2017
  4. remote: use integer division

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 11, 2017
Commits on Feb 10, 2017
  1. fix radios action

    Signed-off-by: javierrodriguezcuevas <javierrodriguezcuevas@gmail.com>
    javierrodriguezcuevas committed Feb 9, 2017
  2. CONTRIBUTING.md: mention the Ctrl+i hotkey for sign-offs

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 10, 2017
  3. CONTRIBUTING.md: mention the newline-at-eof preference

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 10, 2017
Commits on Feb 8, 2017
  1. text: ensure that we cannot index past the content buffer

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 8, 2017
Commits on Feb 7, 2017
  1. Merge pull request #659 from laerreal/dft_reset

    * laerreal/dft_reset:
      dag: revert hotfix of undefined frontier
      dag: use depth-first traversal to reset columns
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 7, 2017
  2. doc: update v2.11 release notes draft

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 7, 2017
  3. Revert "dag: skip saving painter state when painting"

    This reverts commit ad94c33.
    
    Labels disappear when the painter state is not saved.
    
    Reported-by: Efimov Vasily <real@ispras.ru>
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 7, 2017
Commits on Feb 6, 2017
  1. dag: make x_adjust and y_adjust ints

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  2. dag: remove unused variables

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  3. dag: revert hotfix of undefined frontier

    The propagate_frontier assumes that frontier column is always defined. KeyError
    exception is an indicator of an error in another part of the grid layout
    algorithm. So, do not except KeyError to get the error as soon as possible.
    
    The hotfix may be applied again for temporary error elimination.
    
    At the other hand, defining frontier in this place too, complicates the
    algorithm logic.
    
    Signed-off-by: Efimov Vasily <real@ispras.ru>
    Efimov Vasily committed Feb 6, 2017
  4. dag: use depth-first traversal to reset columns

    Signed-off-by: Efimov Vasily <real@ispras.ru>
    Efimov Vasily committed Feb 6, 2017
  5. dag: skip saving painter state when painting

    Tell Qt to not save the painter's state to speedup painting.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  6. dag: smoothly add/remove margin when fitting to selection

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  7. dag: use min_x for the default x_offsets

    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  8. dag: adjust "zoom to fit" so that more nodes are visible

    When the item count is low, add more margin to increase visibility.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  9. dag: add "zoom to fit" hotkey to the commit list

    Make the commit list forward the "f" hotkey to the graph view.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017
  10. dag: fix boundingRect() and shape()

    The default shape() implementation calls boundingRect(), so fix the
    rendering artifacts by implementing boundingRect().
    
    Account for the text, borders, etc so that rendering is correct.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    davvid committed Feb 6, 2017