Skip to content
Snippets Groups Projects
  1. Dec 30, 2021
  2. Jul 09, 2021
  3. Oct 22, 2021
  4. Jan 31, 2021
  5. Aug 13, 2020
  6. Sep 12, 2016
  7. Dec 31, 2015
  8. Dec 02, 2014
    • Siddharth Agarwal's avatar
      git_handler: mark source for rename info as Git or Mercurial · fffe8883960b
      Siddharth Agarwal authored
      See inline comments for why the additional metadata needs to be stored.
      
      This literally breaks all the hashes because of the additional metadata. The
      changing of hashes is unfortunate but necessary to preserve bidirectionality.
      
      While this could be broken up into multiple commits, there was no way to do
      that while preserving bidirectionality. Following the principle that every
      intermediate commit must result in a correct state, I decided to combine the
      commits.
      fffe8883960b
  9. May 27, 2014
  10. Mar 25, 2014
  11. Dec 14, 2013
  12. Dec 13, 2013
  13. Aug 28, 2013
  14. Jan 06, 2013
    • David M. Carr's avatar
      push: provide better output about changed references (issue #64) · a6b7ad535244
      David M. Carr authored
      As pointed out by l33t, Hg-Git's output for push doesn't currently do a very
      good job of telling the user what happened.  My previous changes in this area
      had moved some of the output from status to note, making it only show if
      --verbose was specified.  However, I hadn't realized at the time that the
      reference information (though overly verbose) was providing a valueable purpose
      that otherwise wasn't met; telling the user that a remote reference had changed.
      
      This changeset makes it so that:
      *   default output will include simple messages like "adding reference
          refs/heads/feature" and "updating reference refs/heads/master" (omitting any
          mention of unchanged references)
      *   verbose output will include more detailed messages like "adding reference
          default::refs/heads/feature => GIT:aba43c" and "updating reference
          default::refs/heads/master => GIT:aba43c" (omitting any mention of unchanged
          references)
      *   debug output will include the detailed output like in verbose, but
          addtionally will include messages like "unchanged reference
          default::refs/heads/other => GIT:aba43c"
      
      https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
      a6b7ad535244
    • David M. Carr's avatar
      push: add more output about what was added (issue #64) · 163c452531cf
      David M. Carr authored
      l33t pointed out that currently, Hg-Git doesn't provide any confirmation that a
      push was successful other than the exit code.  Normal Mercurial provides a
      couple other messages followed by "added X changesets with Y changes to
      Z files".  After this change, Hg-Git will provide much more similar output.
      It's not identical, as the underlying model is substantially different, but the
      concept is the same.  The main message is "added X commits with Y trees and
      Z blobs".
      
      This change doesn't affect the output of what references/branches were touched.
      That will be addressed in a subsequent commit.
      
      Dulwich doesn't provide an easy hook to get the information needed for this
      output.  Instead of passing generate_pack_contents as the pack generator
      function to send_pack, I pass a custom function that determines the "missing"
      objects, stores the counts, and then calls generate_pack_contents (which then
      will determine the "missing" objects again.
      
      The new expected output:
      searching for changes # unless quiet true
      <N> commits found     # if verbose true
      list of commits:      # if debugflag true and at least one commit found
      <each hash>           # if debugflag true and at least one commit found
      adding objects        # if at least one commit found unless quiet true
      added <N> commits with <N> trees and <N> blobs # if at least one object unless
                                                     # quiet true
      
      https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
      163c452531cf
  15. Nov 03, 2012
    • David M. Carr's avatar
      tests: convert echos to comments · 52461f71a782
      David M. Carr authored
      Now that we're in the unified test format, there isn't a need to use echo
      to provide context to command output.  This technique actually ends up resulting
      in redundant output.  To preserve the original context, but eliminate the
      redundancy, such echo statements have been converted into comment lines.
      52461f71a782
    • David M. Carr's avatar
      tests: extract git command-line client and dulwich requirements into testutil · 675f19af79ca
      David M. Carr authored
      One or both of these requirements were in almost every test in exactly the same
      way.  Now, these checks are performed in every test that uses the testutil.
      This makes it easier for test authors to add these checks into new tests (just
      add a reference to the testutil, which you'd probably want anyway).
      
      We considered having each test declare their requirements (currently, either
      "git" or "dulwich"), but in this case, preferred the simplicity of having the
      check always performed (even if a particular test doesn't need one or the
      other).  You can't perform any meaningful testing of Hg-Git without both of
      these dependencies properly configured.  The main value to checking for them
      in the tests (rather than just letting the tests fail) is that it gives a
      meaningful error message to help people figure out how to fix their environment.
      In the case that either git or dulwich is missing, the information will be
      just as clearly conveyed regardless of whether its all the tests that are
      skipped, or just most of them.
      
      I didn't add dulwich to hghave (even though this is clearly the sort of thing
      that hghave is intended for) because hghave is currently pulled from Mercurial
      completely unchanged, and it's probably best to keep it that way.
      
      Tested by running the tests in three configurations:
       * No dulwich installed (ran 0, skipped 28, failed 0, output:
              Skipped *: missing feature: dulwich)
       * Bad git on path (ran 1, skipped 27, failed 0, output:
              Skipped *: missing feature: git command line client)
       * Working git and correct version of dulwich installed
              (ran 28, skipped 0, failed 0)
      
      Thanks to Felipe Contreras for the idea to extract this logic into a library.
      675f19af79ca
  16. Oct 31, 2012
    • David M. Carr's avatar
      tests: let git init create directories when applicable · 935c4fb1bbfc
      David M. Carr authored
      It's functionally equivalent to create a directory, cd into it, git init, and
      cd out of the directory, or simply git init with the directory specified.
      
      In several cases, we were doing the former without performing any other
      operations in the git repo, which just made the test unneccesarily complex.
      Even in the case where we still want to cd into the directory, calling git
      init with the directory name eliminates the need for a separate mkdir command.
      
      This changeset converts the former approach to the latter with the goal of
      increasing the readability of the tests.
      
      Thanks to Felipe Contreras for the patch which this was based on.
      935c4fb1bbfc
    • David M. Carr's avatar
      tests: extract commonly used commit/tag functions into testutil library · c4849b2dab87
      David M. Carr authored
      Thanks to Felipe Contreras for the patch which this was based on.
      
      The functions were renamed to make it clearer that these are shell functions
      rather than normal git/hg commands, and to make it clearer which tool is being
      invoked.
      
      Old name | New name
      ------------------------
      commit   | fn_git_commit
      tag      | fn_git_tag
      hgcommit | fn_hg_commit
      hgtag    | fn_hg_tag
      
      Extraction from test-encoding.t was left for a subsequent patch, as I was seeing
      unexpected output changes when I attempted the extraction.
      
      The gitcommit and hgcommit functions in test-bookmark-workflow.t were left
      as-is for now, as they have a different behavior than the standard version
      (separate counters for each).
      c4849b2dab87
    • David M. Carr's avatar
      tests: extract extension configuration into a testutil library · a7da97e69d56
      David M. Carr authored
      Thanks to Felipe Contreras for the patch which this was based on.
      
      Even though the MQ extension was only used in a single test
      (test-pull-after-strip.t), I included it in the testutil.  It shouldn't hurt
      anything to have it enabled and not used, and saves us from having to deal
      with enabling extensions in individual tests at all.
      
      Similarly, this changeset results in the graphlog extension being enabled
      for all tests, even though there were some that didn't use it before.  This is
      even less significant in Mercurial 2.3+, since in those versions, graphlog is
      part of core, and is available even when the extension is disabled.
      a7da97e69d56
  17. Oct 30, 2012
  18. Oct 29, 2012
  19. Oct 26, 2012
    • David M. Carr's avatar
      push: suppress "exporting hg objects to git" message · 9c71a6f00863
      David M. Carr authored
      When communicating with the user on push/outgoing, Mercurial doesn't show a
      "exporting hg objects to git" message, so we shouldn't.  The message has been
      changed to be shown if --verbose is specified.
      9c71a6f00863
    • David M. Carr's avatar
      push: suppress ref output by default · d4ccec82b816
      David M. Carr authored
      When communicating with the user on push, Mercurial doesn't show much on
      success.  Currently, Hg-Git shows every changed ref.  After this change,
      the default output will more closely match Mercurial's regular behavior (no
      per-ref output), while changed refs will be shown if --verbose is specified,
      and all refs will be shown if --debug is specified.
      d4ccec82b816
  20. Oct 08, 2012
    • David M. Carr's avatar
      push: change "no changes" default output to match normal mercurial · 4bc39fd24db3
      David M. Carr authored
      The output for "hg push" when there were no changes didn't quite match between
      Mercurial with and without Hg-Git, so I changed the behavior to bring it into
      synch.  The existing "creating and sending data" message was changed to be
      included if --verbose is specified.
      4bc39fd24db3
  21. Oct 07, 2012
    • David M. Carr's avatar
      tests: fix test-subrepos.t sporadically failing · 6e27c42c99d0
      David M. Carr authored
      I was seeing sporadic failures running this test on Mac OS X 10.8.
      They looked like this:
      +  sed: 1: "s_/private/var/folders/ ...": bad flag in substitute command: 'T'
      
      My assumption is that some character was being included in the path of the
      temporary directory that sed didn't like.  It looks like the sed function was
      being used to eliminate differences between test runs due to the path changing
      each run.  That isn't needed any more now that we're using the unified test
      format, since said replacement is taken care of for us by run-tests.py.  Thus,
      this changeset removes the calls to sed and updates the output to use the result
      from the framework-level replacement.
      6e27c42c99d0
  22. Sep 14, 2012
  23. Sep 13, 2012
  24. Aug 06, 2012
Loading