Skip to content
Snippets Groups Projects
  1. Apr 22, 2014
    • Gregory Szorc's avatar
      run-tests: move diff generation into TestResult · 855f092c96e5
      Gregory Szorc authored
      TestResult is the thing that captures all our test results. It's logical
      for diff viewing to be handled there and not inside Test.
      
      While writing this patch, it was discovered that Test.fail() was
      printing redundant test result output. This has been removed.
      
      Arguments controlling diffs have been removed from Test.__init__.
      855f092c96e5
    • Gregory Szorc's avatar
      run-tests: remove global abort flag · fa6ba4372678
      Gregory Szorc authored
      The global abort flag has been moved into each Test instance. A
      Test.abort() accomplishing the same thing has been added.
      fa6ba4372678
  2. May 08, 2014
    • Durham Goode's avatar
      merge: add conflict marker formatter (BC) · 25d5a9ecbb85
      Durham Goode authored
      Adds a conflict marker formatter that can produce custom conflict marker
      descriptions. It can be set via ui.mergemarkertemplate. The old behavior
      can be used still by setting ui.mergemarkers=basic.
      
      The default format is similar to:
      
        {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"
      
      And renders as:
      
        contextblahblah
        <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
        line from my changes
        =======
        line from the other changes
        >>>>>>> other: a3e55d7f4d38  master - sid0: "This is a commit to master th...
        morecontextblahblah
      25d5a9ecbb85
  3. Apr 22, 2014
  4. Mar 07, 2013
  5. Apr 22, 2014
    • Gregory Szorc's avatar
      run-tests: pass a full test path into Test.__init__ · f8515564d617
      Gregory Szorc authored
      Previously, a Test's path came from the base directory of all tests and
      a filename leaf. There is not a strong reason why an absolute test path
      can not be specified.
      
      This change isn't strictly necessary. But it does enable scenarios such
      as more easily running tests from multiple, non-sibling directories.
      f8515564d617
  6. Apr 21, 2014
  7. May 16, 2014
    • Mads Kiilerich's avatar
      convert: mercurial source: convert global tags only - not local tags · 6b8daeea638a
      Mads Kiilerich authored
      Mercurial tags can be local (tag -l, stored in .hg/localtags) or global (normal
      tags, tracked in .hgtags) ... or extensions can add other kind of tags.
      
      Convert would take all tags (except "tip"), not just the ones from .hgtags, and
      put them into .hgtags.
      
      Instead, convert only the global tags that come from .hgtags.
      6b8daeea638a
  8. Apr 21, 2014
  9. May 17, 2014
  10. Apr 23, 2014
    • Sean Farley's avatar
      localrepo: use _matchstatus of context objects · 6adfc311eee8
      Sean Farley authored
      Now that we have the machinery in place, we call the context method for
      changing the match object in the case of comparing the working directory with
      its parent.
      
      This removes the last of the hard-coded workingctx knowledge in localrepo
      paving the way for us to remove localrepo.status completely.
      6adfc311eee8
  11. Apr 24, 2014
    • Sean Farley's avatar
      workingctx: override _matchstatus for parentworking case · 869a28d016e9
      Sean Farley authored
      This patch encapsulate the logic for changing the match.bad function when
      comparing against the working directory's parent. Future patches will remove
      more of the 'if ... else' blocks in localrepo.status that test for this working
      directory parent case.
      869a28d016e9
Loading