Skip to content
Snippets Groups Projects
  1. Jun 28, 2017
  2. Jun 30, 2017
  3. Jun 26, 2017
    • Boris Feld's avatar
      log: add an extension hook-point in changeset_printer · 4ecc6047d45f
      Boris Feld authored
      Extensions sometimes wants to add other information in the default log output
      format (when no templating is used).
      
      Add an empty function named '_exthook' for easing the extension life.
      Extensions will be able to wrap this function and collaborate to display
      additional information.
      
      Exthook is called after displaying troubles and just before displaying the
      files, extra and description.
      
      Add a new test file to test it and not pollute other test files.
      4ecc6047d45f
  4. Jun 27, 2017
    • Jun Wu's avatar
      drawdag: support obsmarker creation in comments · 4d780d510b44
      Jun Wu authored
      This patch adds special comment handling so one can create obsmarkers in
      drawdag comments like "# replace: A -> B -> C", "# prune: X, Y, Z",
      "split: P -> M, N" and they are just self-explained.
      4d780d510b44
    • Jun Wu's avatar
      test-drawdag: add a test for drawdag.py · 367a3c6473d2
      Jun Wu authored
      The drawdag script is useful but does not have a formal test. This patch
      adds it.
      367a3c6473d2
    • Phil Cohen's avatar
      filemerge: convert a couple of wvfs calls in internal mergetools to contexts · 851825214aa3
      Phil Cohen authored
      One hitch is that sometimes fcd is actually an absentfilectx which does not
      expose any mutator functions. In order to still use the context functions,
      we look up the underlying workingfilectx to perform the write there.
      
      One alternate way would be to put the write functions on the absentfilectx and
      have them pass-through. While this makes the callsites cleaner, we would need
      to decide what its getter functions would return after this point, since
      returning None for `data` (and True for `isabsent()`) might no longer be
      correct after a write. I discussed with Sidd about just having the getters
      raise RuntimeErrors after a mutator has been called, but we actually call
      isabsent() in merge.py after running the internal merge tools.
      851825214aa3
  5. Jun 28, 2017
    • Pierre-Yves David's avatar
      configitems: support callable as a default value · 77e666f943a6
      Pierre-Yves David authored
      Yuya pointed out that using mutable value as the default could be problematic.
      To work around this we now support callable object as default value. This
      allows for creating new mutable objects on demand when needed.
      77e666f943a6
  6. Jun 27, 2017
  7. Jun 26, 2017
  8. Jun 29, 2017
  9. Jun 28, 2017
  10. Jun 26, 2017
    • Gregory Szorc's avatar
      show: config option to register aliases for views · 99ce2f586cd4
      Gregory Szorc authored
      As part of using `hg show` in my daily workflow, I've found it slightly
      annoying to have to type full view names, complete with a space. I've
      locally registered an alias for "swork = show work."
      
      I think others will have this same complaint and could benefit from
      some automation to streamline the creation of aliases. So, this
      commit introduces a config option that allows `hg show` views to be
      automatically aliased using a given prefix. e.g. a value of "s"
      will automatically register "swork" and "sbookmarks." Multiple
      values can be given for ultimate flexibility. This arguably isn't
      needed now. But since we don't register aliases if there will be
      a collision and we're bound to have a collision, it makes sense to
      allow multiple prefixes so specific views can avoid collisions by
      using different prefixes.
      99ce2f586cd4
  11. Jun 18, 2017
  12. Jun 17, 2017
  13. Jun 18, 2017
  14. Jun 17, 2017
  15. Jun 18, 2017
  16. Jun 27, 2017
  17. Jun 28, 2017
    • Adam Simpkins's avatar
      tests: more completely restore the environment in syshgenv · 98e2c78e309c
      Adam Simpkins authored
      Update the syshgenv function to attempt to completely restore the original
      environment, rather than only updating a few specific variables.  run_tests.py
      now generates a shell script that can be used to restore the original
      environment, and syshgenv sources it.
      
      This is a bit more complicated than the previous code, but should do a better
      job of running the system hg in the correct environment.
      
      I've tested it on Linux using python 2.x, but let me know if it causes issues
      in other environments.  I'm not terribly familiar with how the tests get run on
      Windows, for instance, and how the environment needs to be updated there.
      98e2c78e309c
    • Jun Wu's avatar
      tests: do not use system hg if it does not have "files" command · acfce52518c4
      Jun Wu authored
      Ancient hg does not have "hg files" so test-check-*.t will fail with
      "unknown command 'files'":
      
        $ hg files
        hg: unknown command 'files'
        $ hg --version
        Mercurial Distributed SCM (version 2.6.2)
      
      Test "hg files" and give up using syshg if it does not have "files" command.
      acfce52518c4
  18. Jun 27, 2017
    • Pierre-Yves David's avatar
      rebase: also test abort from pretxnclose error · 22ab466480ea
      Pierre-Yves David authored
      Different hooks will have different properties so we cover more hooks to catch
      further regressions.
      22ab466480ea
    • Pierre-Yves David's avatar
      rebase: reinforce testing around precommit hook interrupting a rebase · e7faa4a14d5d
      Pierre-Yves David authored
      Different hooks will have different properties so we cover more hooks to catch
      further regression.
      e7faa4a14d5d
    • Pierre-Yves David's avatar
      rebase: provides test case for (issue5610) · 918e7dcf8820
      Pierre-Yves David authored
      The 4.2 release introduces a regression regarding the behavior of rebase with
      some hook failures. We add the tests from the bug report from Henrik Stuart to
      our test base to prevent further regression on this.
      918e7dcf8820
    • Pierre-Yves David's avatar
      rebase: backed out changeset cf8ad0e6c0e4 (issue5610) · a5abaa81fad6
      Pierre-Yves David authored
      Having a single transaction for rebase means the whole transaction gets rolled back
      on error. To work around this a small hack has been added to detect merge
      conflict and commit the work done so far before exiting. This hack works because
      there is nothing transaction related going on during the merge phase.
      
      However, if a hook blocks the rebase to create a changeset, it is too late to commit the
      work done in the transaction before the problematic changeset was created. This
      leads to the whole rebase so far being rolled back. Losing merge resolution and
      other work in the process. (note: rebase state will be fully lost too).
      
      Since issue5610 is a pretty serious regression and the next stable release is a
      couple day away, we are taking the backout route until we can figure out
      something better to do.
      a5abaa81fad6
    • Pierre-Yves David's avatar
      rebase: backed out changeset 2519994d25ca · b63351f6a246
      Pierre-Yves David authored
      In the process of fixing issue5610 in 4.2.2, we are trying to backout
      cf8ad0e6c0e4. This changeset is making changes that depend on cf8ad0e6c0e4,
      so we need to back it out first.
      
      Since issue5610 is pretty serious regression and the next stable release is a
      couple of days away, we are taking the backout route until we can figure out
      something better to do.
      b63351f6a246
  19. Jun 28, 2017
  20. Jun 27, 2017
  21. Jun 28, 2017
Loading