Skip to content
Snippets Groups Projects
  1. Jan 17, 2014
  2. Jan 15, 2014
    • Sean Farley's avatar
      commands: use bookmarks.validdest instead of duplicating logic · 2cfb7205
      Sean Farley authored
      Now that bookmarks.py has grown a validdest method that even handles successor
      changesets, we use that instead of duplicating the logic in commands.py
      2cfb7205
    • Sean Farley's avatar
      update: consider successor changesets when moving active bookmark · 67ee87a3
      Sean Farley authored
      Previously, when an obsolete changeset was bookmarked, successor changesets were not considered
      when moving the bookmark forward. Now that a bare update will move to the tip most of the
      successor changesets, we also update the bookmark logic to allow the bookmark to move with this
      update.
      
      Tests have been updated and keep issue4015 covered as well.
      67ee87a3
    • Sean Farley's avatar
      merge: consider successor changesets for a bare update · 95b9c614
      Sean Farley authored
      Previously, a bare update would ignore any successor changesets thus
      potentially leaving you on an obsolete head. This happens commonly when there
      is an old bookmark that hasn't been moved forward which is the motivating
      reason for this patch series.
      
      Now, we will check for successor changesets if two conditions hold: 1) we are
      doing a bare update 2) *and* we are currently on an obsolete head.
      
      If we are in this situation, then we calculate the branchtip of the successor
      set and update to that changeset.
      
      Tests coverage has been added.
      95b9c614
  3. Nov 06, 2013
  4. Jan 16, 2014
  5. Jan 09, 2014
  6. Jan 08, 2014
    • Pierre-Yves David's avatar
      backout: avoid update on simple case. · 2123d27f
      Pierre-Yves David authored
      Before the changeset the backout process was:
      1) go to <target>
      2) revert to <target> parent
      3) update back to changeset we came from
      
      The two update steps can takes a very long time to move back and forth unrelated
      file change between <target> and current working directory.
      
      The new process is just merging current working directory with the parent of
      <target> using <target> as ancestor. This give the very same result but skip
      the two updates. On big repo with a lot of files and changes that save a lots of
      time (x20 for one week window).
      
      The "merge" version (hg backout --merge) is still done with upgrades. We could
      imagine using in memory commit to speed it up but this is another fish.
      2123d27f
  7. Jan 16, 2014
    • Simon Heimberg's avatar
      run-tests: print more information on unnecessary glob matching · 7a259dfe
      Simon Heimberg authored
      Extend the message with the test name and the approximate line number. (The
      line number is the one of the command producing the output.)
      Finding the line to fix is easier now.
      
      old message:
      ......
      Info, unnecessary glob: at a/b/c (glob)
      ..
      
      new message:
      ......
      Info, unnecessary glob in test-example.t (after line 9): at a/b/c (glob)
      ..
      
      
      The test result is still pass as before.
      7a259dfe
    • Simon Heimberg's avatar
      run-tests: suggest to append glob when only path sep does not match · d9d6cbbe
      Simon Heimberg authored
      When the line does not match because of \ instead of / (on windows), append
      (glob) in the expected output.
      This allows to rename test-bla.t.err to test-bla.t for getting a correct
      output. This worked for other failures like missing (esc), but not here.
      
        Output example (only +- lines of diff):
      Before:
      -  path/with/local/sep
      +  path\\with\\local/sep
      Now:
      -  path/with/local/sep
      +  path/with/local/sep (glob)
      d9d6cbbe
    • Simon Heimberg's avatar
      run-tests: test each line matching function on its own · 9e3eb009
      Simon Heimberg authored
      This has several advantages.
       * Each match function can return some information to the caller runone (used in
         the next patch).
       * It is not checked that the line ends in " (glob)" when rematch() returns
         false.
       * And it looks more readable.
      9e3eb009
    • Simon Heimberg's avatar
      tests: new test for line matching functions in run-tests · 4453d08a
      Simon Heimberg authored
      Test for failing matches and warnings. (The existing test-run-tests.t can not
      do both by design.) And simulate matching on other os.
      4453d08a
  8. Jan 09, 2014
  9. Dec 01, 2013
  10. Jan 06, 2014
  11. Jan 04, 2014
  12. Jan 15, 2013
  13. Jan 04, 2014
  14. Jan 16, 2014
  15. Jan 07, 2014
  16. Jan 16, 2014
  17. Jan 07, 2014
  18. Nov 16, 2013
  19. Nov 17, 2013
    • Mads Kiilerich's avatar
      rebase: improve error message for --base being empty or causing emptiness · dc515784
      Mads Kiilerich authored
      Before it just said 'nothing to rebase'.
      
      Now 'if "base" is an empty set:
        abort: empty "base" revision set - can't compute rebase set
      
      If the set of changesets to rebase can't be found from "base", it will fail as
      before but with more explanation of what the problem was.
      
      The name of the "base" option is not obvious - it is more like "samples
      identifying the branch to rebase". The error messages for problems with the
      specified "base" value will use that term and might thus also not be obvious,
      but at least they are consistent with the option name. The name "base" will not
      be used if the base only was specified implicitly as the working directory
      parent.
      dc515784
    • Mads Kiilerich's avatar
      rebase: improve error message for empty --source set · 3bff26f6
      Mads Kiilerich authored
      Before, it just said 'nothing to rebase' in this case. Now, it aborts
      mentioning the reason: 'empty "source" revision set'.
      
      Specifying revisions that cannot be rebased is a 'soft' error, but specifying
      an empty set deserves an abort that explains exactly what the problem is.
      3bff26f6
  20. Nov 16, 2013
    • Mads Kiilerich's avatar
      rebase: improve error message for empty --rev set · a259f7b4
      Mads Kiilerich authored
      Before, it just said 'nothing to rebase' in this case. Now, it aborts
      mentioning the reason: 'empty "rev" revision set'.
      
      Specifying revisions that cannot be rebased is a 'soft' error, but specifying
      an empty set deserves an abort that explains exactly what the problem is.
      a259f7b4
  21. Nov 17, 2013
Loading