Skip to content
Snippets Groups Projects
  1. Sep 02, 2014
  2. Sep 01, 2014
  3. Aug 30, 2014
    • Gregory Szorc's avatar
      help: only call doc() when it is callable · e284de13
      Gregory Szorc authored
      `hg help -k` on my machine was aborting because the hg-prompt extension
      was inserting a string and not a function into help.helptable and help
      was blindly calling it.
      
      This patch changes keyword searching to be more robust against
      unexpected types.
      e284de13
  4. Sep 01, 2014
  5. Aug 31, 2014
  6. Aug 30, 2014
  7. Aug 31, 2014
    • Mike Hommey's avatar
      repoview: fix typo in repoview.changelog · e1d5fcab
      Mike Hommey authored
      Incidentally, this avoids the changelog cache being invalidated each time
      it's accessed on a repoview.
      
      On a filtering experiment on a repository the size of mozilla-central,
      this makes a significant difference:
      
      Before, running hg log -l 10 --time with about 8k changesets filtered out:
      time: real 1.490 secs (user 1.450+0.000 sys 0.040+0.000)
      
      After:
      time: real 0.540 secs (user 0.530+0.000 sys 0.010+0.000)
      e1d5fcab
  8. Aug 19, 2014
  9. Aug 30, 2014
  10. Aug 27, 2014
    • Katsunori FUJIWARA's avatar
      import: show the warning message for failure of merging · 0c838e74
      Katsunori FUJIWARA authored
      Before this patch, no message is shown for failure of merging at "hg
      import".
      
      In such case, merging patch is imported as a normal revision silently,
      and it may confuse users.
      
      For simplicity, this patch recommends just using "--exact", even
      though importing the merging patch itself is possible without it if:
      
        - the hash of the 1st parent in the patch is equal to one of the
          patch imported just before (or the parent of the working
          directory, for the 1st patch of the series), and
      
        - the hash of the 2nd parent in the patch is known in the local
          repository
      0c838e74
    • Mads Kiilerich's avatar
      graft: fix collision detection with origin revisions that are missing · 9472284d
      Mads Kiilerich authored
      When grafting something with a matching origin, it would normally be skipped:
        skipping already grafted revision 123 (23 also has origin 12)
      
      But after stripping a graft origin, graft could fail with a reference to the
      origin that no longer exists:
        abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'!
      
      Instead, detect that the origin is unknown and skip it anyway, like:
        skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)
      9472284d
  11. Aug 23, 2014
  12. Aug 25, 2014
  13. Aug 15, 2014
  14. Aug 14, 2014
  15. Aug 13, 2014
  16. Aug 12, 2014
  17. Aug 11, 2014
    • Matt Mackall's avatar
      unbundle: fix pyflakes warning about wc · 42b13446
      Matt Mackall authored
      42b13446
    • Matt Mackall's avatar
      unbundle: don't advance bookmarks (issue4322) (BC) · f72b71ba
      Matt Mackall authored
      This behavior didn't make much sense and interacts badly with things
      that use unbundle internally like shelve. Presumably, the original
      rationale was that since bundles didn't contain bookmarks, this gave a
      sense of keeping bookmarks up-to-date like would happen with a
      corresponding pull. However, since it only updated the current active
      bookmark, and bare update already did that anyway, this is pretty
      slim.
      
      Notably, the corresponding test actually works better without this
      feature.
      f72b71ba
  18. Aug 10, 2014
Loading