1. 29 Nov, 2012 1 commit
  2. 28 Oct, 2012 1 commit
    • Kai Willadsen's avatar
      Remove the 'Add binary' command, used only by CVS · a1ae2d91
      Kai Willadsen authored
      CVS servers can be configured with relatively sane defaults, or the
      issue can be dealt with from the command line. This command was taking
      up menu and toolbar space for the benefit of a single, increasingly
      unused version control system.
  3. 11 Jun, 2012 1 commit
    • Kai Willadsen's avatar
      Rework existing exception usage to 2.6+ except-as syntax · a61982ff
      Kai Willadsen authored
      Since the PEP 3110 changes to the exception syntax are supported under
      Python 2.6 and later, we can now change over to using the new-style
      "except Foo as e" syntax. This improves clarity, and is one less thing
      to fix in a 3.0 future.
  4. 25 May, 2011 1 commit
  5. 21 Aug, 2010 1 commit
    • Peter Tyser's avatar
      vc: Add ability to check if version control repos are valid · c1ce5ba8
      Peter Tyser authored
      Sometimes meld may be ran in a directory that contains invalid or
      corrupt version control information.  (eg run 'mkdir .svn; meld .' in a
      git repository).  Previously meld would not gracefully handle invalid
      repositories.  This patch attempts to add a quick sanity check
      to most version control systems.  The checks are meant to be
      as quick as possible to reduce startup time.
      Signed-off-by: 's avatarPeter Tyser <ptyser@gmail.com>
  6. 13 Jun, 2010 1 commit
  7. 13 Sep, 2009 1 commit
  8. 23 May, 2009 1 commit
  9. 01 May, 2009 2 commits
    • Vincent Legoll's avatar
      Fix darcs traceback in a repository with no · fec3db7e
      Vincent Legoll authored
      changes, for example like an empty repository.
      Reproduce with:
      - cd /tmp
      - mkdir darcsempty
      - cd darcsempty
      - meld .
      Traceback (most recent call last):
        File "/home/vince/dev/git/meld/task.py", line 130, in iteration
          ret = task()
        File "/home/vince/dev/git/meld/vcview.py", line 290, in _search_recursively_iter
        File "/home/vince/dev/git/meld/vc/_vc.py", line 177, in cache_inventory
          self._tree_cache = self._lookup_tree_cache(directory)
        File "/home/vince/dev/git/meld/vc/darcs.py", line 83, in _lookup_tree_cache
          non_boring = self._get_whatsnew()
        File "/home/vince/dev/git/meld/vc/darcs.py", line 110, in _get_whatsnew
          status = self.state_map[elements.pop(0)]
      KeyError: 'No'
    • Vincent Legoll's avatar
      Add "mark as resolved" VC action & buttons · 95b42388
      Vincent Legoll authored
      Rediffing the patch from Matthijs van de Water from
      the bug 403193 - Can't resolve subversion conflicts
      And updating it to current meld code
  10. 22 Apr, 2009 1 commit
  11. 21 Apr, 2009 1 commit
    • Vincent Legoll's avatar
      Create a CachedVc class to gather all common code · b86bfd15
      Vincent Legoll authored
      duplicated between VC plugins that cache repository
      status informations.
      There are slight behaviour changes:
      bzr, monotone & git used to have a get_tree() which
      always called lookup_tree() if it was not already cached,
      but without caching at that time either. I think this was
      wrong and only cut'n'pasted between plugins. But
      would like to hear from the creators of those plugins.
      The remaining of the patch is mostly renaming and
      passing an additional "directory" argument to
      _lookup_tree_cache() as was required for bzr, but
      which remains unused for other plugins.
  12. 11 Apr, 2009 1 commit
  13. 17 Mar, 2009 1 commit
  14. 09 Mar, 2009 2 commits
  15. 03 Mar, 2009 1 commit
  16. 01 Mar, 2009 1 commit
    • Vincent Legoll's avatar
      Factorize repository root finding code · d166deff
      Vincent Legoll authored
      Bug 573049
      There's code duplication in vc plugins.
      The code that tries to find the repository root is duplicated in a lot of files
      and is almost always identical.
      The attached patch tries to consolidate this into a single implementation in
      svn path=/trunk/; revision=1189
  17. 13 Mar, 2008 1 commit
  18. 06 Dec, 2007 1 commit
  19. 12 Dec, 2005 1 commit
  20. 21 Nov, 2005 1 commit