Skip to content
Snippets Groups Projects
  1. Oct 29, 2012
    • David M. Carr's avatar
      tests: fix check for dulwich in test-subrepos.t · b933b2b06b87
      David M. Carr authored
      In converting this test to the unified format, it looks like we missed this
      line.  It was accidentally being treated as a comment rather than executable.
      b933b2b06b87
    • David M. Carr's avatar
      tests: uncomment calls to hghave git · 81832807d193
      David M. Carr authored
      Now that hghave git works properly, uncomment the calls, and add ones that were
      missing.
      81832807d193
    • David M. Carr's avatar
      tests: pull in hghave · 8c6dc6a6f5d8
      David M. Carr authored
      Previously, the hghave checks that were commented out in the tests were broken
      if uncommented.  One cause was that it was expecting hghave in the testdir,
      while our testdir didn't contain hghave.  Now it does.
      
      The hghave was pulled unmodified from Mercurial 2.3, to match the version of
      run-tests.py in use.
      8c6dc6a6f5d8
    • David M. Carr's avatar
      listkeys: simplify ref stripping expression · b3881fda3ce9
      David M. Carr authored
      Eliminate a find that would always return 0, based on an example in git_handler
      update_hg_bookmarks.
      b3881fda3ce9
  2. Oct 27, 2012
  3. Oct 26, 2012
    • durin42's avatar
      Merge · 9f919924bf81
      durin42 authored
      9f919924bf81
    • 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
    • David M. Carr's avatar
      ab8061d9942b
    • David M. Carr's avatar
      gitrepo: initial support for listkeys · 4f4ab2d89375
      David M. Carr authored
      This changeset adds test coverage for comparing "hg outgoing -B" in normal
      Mercurial usage with Hg-Git usage.  This didn't match, since previously, gitrepo
      didn't provide a meaningful listkeys implementation.  Now, it does.
      
      gitrepo now has access to a GitHandler when a localrepo is available.  This
      handler is used to access the information needed to implement listkeys for
      namespaces (currently, only bookmarks) and bookmarks.
      
      A couple of other tests were testing "divergent bookmark" scenarios.  These
      tests have been updated to filter out the divergent bookmark output, as it isn't
      consistent across the supported Mercurial versions.
      4f4ab2d89375
  4. Oct 25, 2012
    • David M. Carr's avatar
      peer: pass localrepo to new gitrepo instances · affd119533ae
      David M. Carr authored
      This change wraps hg.peer to allow for capturing the repo object.  It is then
      passed in to new gitrepo instanceds.  This will be needed to implement later
      functionality, such as richer bookmark support using pushkeys.
      affd119533ae
    • David M. Carr's avatar
      push: fix traceback when pushing empty hg repo to empty git repo (issue #58) · 06a29fdd52a7
      David M. Carr authored
      In the logic that was attempting to handle the case where the local repo doesn't
      have any bookmarks, the assumption was being made that tip resolved to a
      non-null revision.  In the case of a totally empty local repo, however, that
      isn't a valid assumption, and resulted in attempting to set the master ref
      to None, which broke dulwich.
      
      The "fix", which avoids the traceback and allows the push to complete (though
      still do nothing, since in this case there aren't any changes to push), is to
      not tweak the refs at all if tip is nullid.  Leaving the special capabilities
      ref and not adding a master ref appears to be fine in this case.
      06a29fdd52a7
  5. Oct 18, 2012
  6. Oct 17, 2012
    • durin42's avatar
      Merge · f3f344aac42b
      durin42 authored
      f3f344aac42b
    • durin42's avatar
      git_handler: lazy-load mapping · bff92a208c3f
      durin42 authored
      Loading the mapping was costing about half a second for a user on IRC
      on the pidgin repo. There's no reason to load this data aggressively.
      bff92a208c3f
  7. Oct 08, 2012
    • David M. Carr's avatar
      tests: add workflow coverage for push with no changes · c0c1a96ef56d
      David M. Carr authored
      test-bookmark-workflow.t now skips all Mercurial versions below 2.1, as the
      return code is different, and it's more important for this test to accurately
      show that we match the behavior of current Mercurial than that all versions
      behave the same.
      c0c1a96ef56d
    • 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
  8. Oct 07, 2012
    • David M. Carr's avatar
      tests: add coverage for outgoing with no changes · 36812cecfb9e
      David M. Carr authored
      36812cecfb9e
    • David M. Carr's avatar
      461fe932c388
    • 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
  9. Sep 28, 2012
    • David M. Carr's avatar
      docs: include testedwith · c5d4900a804e
      David M. Carr authored
      Mercurial has support for including information about the tested versions of
      Mercurial for an extension when it detects that an extension has broken.  This
      change includes the appropriate attribute in the extension.
      c5d4900a804e
    • David M. Carr's avatar
      docs: include buglink · 22b8df4c54c5
      David M. Carr authored
      Mercurial has support for including a link to an issue tracker when it detects
      that an extension has broken.  This change includes the appropriate attribute
      in the extension, pointing it at the issue tracker for the main BitBucket repo.
      22b8df4c54c5
    • David M. Carr's avatar
      outgoing: don't delete remote refs · ebf4ea20ade5
      David M. Carr authored
      There was a bug introduced in 8c1f2b07c04b such that calling hg outgoing on
      a Git repository would result in all refs being deleted from the remote
      repository (with the possible exception of the currently checked out branch).
      It wasn't noticed before because the existing test for outgoing didn't actually
      verify the refs on the remote.  This changeset fixes the bug, as well as adding
      test coverage to allow verifying that the fix works.
      ebf4ea20ade5
  10. Sep 22, 2012
  11. Sep 16, 2012
  12. Sep 14, 2012
Loading