Skip to content
Snippets Groups Projects
  1. Nov 19, 2015
    • Siddharth Agarwal's avatar
      resolve: fix incorrect merge · ec372573
      Siddharth Agarwal authored
      The merge from stable into default was semantically incomplete -- a couple of
      changes in preceding code had to be rewritten here.
      
      This code only triggers for change/delete conflicts, so we can't test it yet.
      We will soon be able to do it, though.
      ec372573
  2. Nov 18, 2015
    • liscju's avatar
      fileset: add missing() predicate (issue4925) · ceef5fb1
      liscju authored
      Help of status cmd defines status file of 'missing', what is
      called in fileset 'deleted'. To stay consistent this patch
      introduces missing() predicate which in fact is alias to
      'deleted'.
      ceef5fb1
  3. Nov 10, 2015
    • Anton Shestakov's avatar
      webutil: make _siblings into an object with __iter__ and __len__ · 0c8ef79b
      Anton Shestakov authored
      _siblings is a helper that is used for displaying changeset parents and
      children in hgweb. Before, when it was a simple generator, it couldn't tell its
      length without being consumed, and that required a special case when preparing
      data for changeset template (see 9e1f4c65f5f5).
      
      Let's make it into a class (similar to templatekw._hybrid) that allows len(...)
      without side-effects.
      0c8ef79b
  4. Nov 19, 2015
  5. Nov 18, 2015
  6. Nov 01, 2015
  7. Nov 19, 2015
    • Matt Mackall's avatar
      perf: un-bitrot perfstatus · cdc3e437
      Matt Mackall authored
      cdc3e437
    • Matt Mackall's avatar
      util: drop statmtimesec · 448cbdab
      Matt Mackall authored
      We've globablly forced stat to return integer times which agrees with
      our extension code, so this is no longer needed.
      
      This speeds up status on mozilla-central substantially:
      
      $ hg perfstatus
      ! wall 0.190179 comb 0.180000 user 0.120000 sys 0.060000 (best of 53)
      $ hg perfstatus
      ! wall 0.275729 comb 0.270000 user 0.210000 sys 0.060000 (best of 36)
      448cbdab
    • Matt Mackall's avatar
      util: disable floating point stat times (issue4836) · 341cb90f
      Matt Mackall authored
      Alternate fix for this issue which avoids putting extra function calls
      and exception handling in the fast path.
      
      For almost all purposes, integer timestamps are preferable to
      Mercurial. It stores integer timestamps in the dirstate and would thus
      like to avoid doing any float/int comparisons or conversions. We will
      continue to have to deal with 1-second granularity on filesystems for
      quite some time, so this won't significantly hinder our capabilities.
      
      This has some impact on our file cache validation code in that it
      lowers timestamp resolution. But as we still have to deal with
      low-resolution filesystems, we're not relying on this anyway.
      
      An alternate approach is to use stat[ST_MTIME], which is guaranteed to
      be an integer. But since this support isn't already in our extension,
      we can't depend on it being available without adding a hard Python->C
      API dependency that's painful for people like yours truly who have
      bisect regularly and people without compilers.
      341cb90f
  8. Nov 18, 2015
  9. Nov 19, 2015
  10. Nov 18, 2015
    • Laurent Charignon's avatar
      rebase: don't rebase obsolete commits with no successor · 5eac7ab5
      Laurent Charignon authored
      This patch avoids unnecessary conflicts to resolve during rebase for the users
      of changeset evolution.
      
      This patch modifies rebase to skip obsolete commits with no successor.
      It introduces a new rebase state 'revpruned' for these revisions that are
      being skipped and a new message to inform the user of what is happening.
      This feature is gated behind the config flag experimental.rebaseskipobsolete
      
      When an obsolete commit is skipped, the output is:
      note: not rebasing 7:360bbaa7d3ce "O", it has no successor
      5eac7ab5
    • Laurent Charignon's avatar
      rebase: fix a typo in test-rebase-obsolete · 53c668dc
      Laurent Charignon authored
      We had left a lonely single quote where it shouldn't be!
      53c668dc
  11. Nov 19, 2015
  12. Nov 01, 2015
  13. Nov 17, 2015
  14. Nov 11, 2015
  15. Nov 18, 2015
  16. Nov 17, 2015
  17. Nov 18, 2015
    • Laurent Charignon's avatar
      localrepo: put bookmark move following commit in one transaction · 4414d500
      Laurent Charignon authored
      Before this patch, making a commit on a local repo could move a bookmark and
      both operations would not be grouped as one transaction. This patch makes both
      operations part of one transaction. This is necessary to switch to the new api
      to save bookmarks repo._bookmarks.recordchange if we don't want to change the
      current behavior of rollback.
      
      Dirstate change happening after the commit is done is now part of the
      transaction mentioned above. This leads to a change in the expected output of
      several tests.
      
      The change to test-fncache happens because both lock are now released in the
      same finally clause. The lock release is made explicitly buggy in this test.
      Previously releasing lock would crash triggering release of wlock that crashes
      too. Now lock release crash does not directly result in the release of wlock.
      Instead wlock is released at garbage collection time and the error raised at
      that time "confuses" python.
      4414d500
  18. Nov 17, 2015
  19. Nov 18, 2015
  20. Nov 17, 2015
Loading