Skip to content
Snippets Groups Projects
  1. Jan 08, 2016
  2. Mar 12, 2015
  3. Dec 02, 2014
    • Siddharth Agarwal's avatar
      git_handler: mark source for rename info as Git or Mercurial · fffe8883
      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.
      fffe8883
  4. May 27, 2014
  5. Dec 13, 2013
  6. Aug 28, 2013
  7. Jan 06, 2013
    • David M. Carr's avatar
      push: provide better output about changed references (issue #64) · a6b7ad53
      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
      a6b7ad53
    • David M. Carr's avatar
      push: add more output about what was added (issue #64) · 163c4525
      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
      163c4525
  8. Nov 03, 2012
    • David M. Carr's avatar
      tests: avoid changing the current directory · 6cc99298
      David M. Carr authored
      Mercurial allows specifying which repository to use via the -R/--repository
      option.  Git allows a similar function using the --git-dir option.  By using
      these options, in many cases we can avoid checking the current directory.
      This makes tests easier to understand, as you don't need to remember which
      directory you're in to understand what's going on.  It also makes tests easier
      to write, as you don't need to remember to cd out of a directory when you're
      done doing things there.
      
      Thanks to Felipe Contreras for the patch which this was based on.
      6cc99298
    • David M. Carr's avatar
      tests: extract git command-line client and dulwich requirements into testutil · 675f19af
      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.
      675f19af
  9. Oct 31, 2012
    • David M. Carr's avatar
      tests: let git init create directories when applicable · 935c4fb1
      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.
      935c4fb1
    • David M. Carr's avatar
      tests: extract commonly used commit/tag functions into testutil library · c4849b2d
      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).
      c4849b2d
    • David M. Carr's avatar
      tests: extract extension configuration into a testutil library · a7da97e6
      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.
      a7da97e6
  10. Oct 29, 2012
  11. Oct 26, 2012
    • David M. Carr's avatar
      push: suppress "exporting hg objects to git" message · 9c71a6f0
      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.
      9c71a6f0
    • David M. Carr's avatar
      push: suppress ref output by default · d4ccec82
      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.
      d4ccec82
  12. Oct 08, 2012
  13. Sep 14, 2012
    • David M. Carr's avatar
      tests: eliminate use of git-daemon · 7edcbdd2
      David M. Carr authored
      Dulwich now supports local repositories just fine.  Not using the daemon makes
      the tests easier to read and more reliable (less likely to be skipped because
      a stray daemon is holding onto the port).
      7edcbdd2
    • David M. Carr's avatar
      tests: remove piping of command git init to remove leading path · e48a3f30
      David M. Carr authored
      In many cases we were piping to a python script to strip out the varying leading
      path to the test repos.  This is no longer needed, as the modern run-test.py
      automatically substitutes the leading path as $TESTTMP.  Eliminating the piping
      makes the tests easier to read and write, as well as allowing the exit codes
      to be verified by the test.
      e48a3f30
    • David M. Carr's avatar
      tests: remove configuration of bookmarks extension · bc7b18c2
      David M. Carr authored
      All of our supported Hg versions include bookmarks in core.  Thus, actovating
      it in the hgrc and setting bookmarks.track.current are no longer needed.
      bc7b18c2
  14. Sep 10, 2012
  15. Feb 15, 2012
  16. Sep 09, 2011
    • Ehsan Akhgari's avatar
      Improve the parsing of author lines from Mercurial to generate committer and... · ccd38138
      Ehsan Akhgari authored
      Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand
      
      Signed-off-by: default avatarEhsan Akhgari <ehsan.akhgari@gmail.com>
      ---
      I found a number of bugs when I was trying to convert Mozila's hg repository
      to git using hg-git.  This patch fixes a number of bugs with irregular
      author lines present in hg repositories.  Git cannot correctly process a
      commit object which has a committer or author line in a format that it does
      not understand, which makes it not be able to handle the repositories
      with have such commit objects.
      
      The added test cases shows the irregular cases that this patch is able to
      deal with.
      ccd38138
  17. May 15, 2011
  18. Mar 26, 2010
  19. Nov 23, 2009
  20. Oct 25, 2009
  21. Jul 07, 2009
  22. Jul 02, 2009
Loading