Skip to content
Snippets Groups Projects
  1. May 10, 2014
  2. May 14, 2014
  3. Aug 02, 2012
  4. May 13, 2014
  5. May 06, 2014
  6. Mar 11, 2014
  7. Apr 22, 2014
    • Sean Farley's avatar
      workingctx: call _dirstatestatus in status · ed608a54
      Sean Farley authored
      Rip out the call from workingctx.status to localrepo.status.
      ed608a54
    • Sean Farley's avatar
      context: add private _dirstatestatus method · 38743c59
      Sean Farley authored
      This patch is a step forward in getting rid of needing to check 'parentworking'
      throughout the status method. Eventually, we will use the power of inheritance
      to do the correct thing when comparing the working directory with its parent.
      
      This method is mostly a copy from localrepo.status. The custom status method of
      workingctx will eventually be absorbed by the refactoring of localrepo.status
      to context.status but unfortunately we can't do it in one step.
      38743c59
  8. Mar 11, 2014
  9. Mar 07, 2014
  10. May 09, 2014
    • Mads Kiilerich's avatar
      merge: separate worker functions for batch remove and batch get · b1ce47da
      Mads Kiilerich authored
      The old code had one function that could do 2 different things. First,
      is was called a bunch of times to do one thing. Next, it was called a
      bunch of times to do the other thing. That gave unnecessary complexity
      and a dispatch overhead. Having separate functions is "obviously" better
      than having a function that can do two things, depending on its parameters.
      It also prepares the code for the next refactorings.
      b1ce47da
  11. Apr 22, 2014
    • Mads Kiilerich's avatar
      merge: change debug logging - test output changes but no real changes · cb158354
      Mads Kiilerich authored
      Preparing for action list split-up, making sure the final change don't have any
      test changes.
      
      The patch moves debug statements around without really changing anything.
      Arguably, it temporarily makes the code worse. The only justification is that
      it makes it easier to review the test changes ... and in the end the big change
      will not change test output at all.
      
      The changes to test output are due to changes in the ordering of debug output.
      That is mainly because we now do the debug logging for files when we actually
      process them. Files are also processed in a slightly different but still
      correct order. It is now primarily ordered by action type, secondarily by
      filename.
      
      The patch introduces some redundancy. Some of it will be removed again, some of
      it will in the end help code readability and efficiency. It is possible that we
      later on could introduce a "process this action list and do some logging and
      progress reporting and apply this function".
      
      The "preserving X for resolve" debug statements will only have single space
      indentation. It will no longer have a leading single space indented "f: msg ->
      m" message. Having this message double indented would thus no longer make
      sense.
      
      The bid actions will temporarily be sorted using a custom sort key that happens
      to match the sort order the simplified code will have in the end.
      cb158354
  12. May 15, 2014
  13. May 01, 2014
    • Mads Kiilerich's avatar
      merge: change priority / ordering of merge actions · e7419720
      Mads Kiilerich authored
      The ordering of actions matters. Normal file system semantics is that files
      have to be removed before a directory with the same name can be created.
      
      Before the first ordering key was to have 'r' and 'f' actions come first,
      secondary key was the filename.
      
      Because of future refactorings we want to consistently have all action types
      (with a sensible priority) as separate first keys. Grouped by action type, we
      sort by filename.
      
      Not processing in strict filename order could give worse performance,
      especially on spinning disks. That is however primarily an issue in the cases
      where "all" actions are of the same kind and will be grouped together anyway.
      e7419720
  14. May 17, 2014
    • Pierre-Yves David's avatar
      run-tests: fix --interactive option · 9a1e3d70
      Pierre-Yves David authored
      ``TTest._testpath`` never existed. This must be the remain of some contributors
      side refactoring.
      9a1e3d70
    • Pierre-Yves David's avatar
      run-test: fix AttributeError in the --interactive prompt · 82f8d4e9
      Pierre-Yves David authored
      One must choose between ``"y yes".split()`` and ``('y', 'yes')``. I choose the
      later.
      
      The feature still crash when you answer "yes" to use it. But at least, the
      prompt itself works.
      82f8d4e9
    • Pierre-Yves David's avatar
      run-test: restore the -i prompt by write .err before checking if it exists · 3b0c522f
      Pierre-Yves David authored
      The `--interactive` flag workis by overwriting the original test file by its
      `.err` version. So we need to write it before calling `self.fail`. Otherwise the
      `.err` file does not exists and `--interactive` is ignored.
      
      We can move that block code around because it is dedicated to write changed
      output and we moves it in the try-except dedicated to handling changed output.
      
      Note that the flog is still badly broken after this change. But at least it crash
      instead of being ignored.
      3b0c522f
  15. Apr 20, 2014
Loading