Skip to content
Snippets Groups Projects
  1. Apr 02, 2013
  2. Feb 15, 2013
  3. Apr 01, 2013
  4. Mar 30, 2013
  5. Mar 29, 2013
  6. Mar 01, 2013
  7. Feb 28, 2013
  8. Mar 23, 2013
    • Idan Kamara's avatar
      localrepo: always write the filtered phasecache when nodes are destroyed (issue3827) · 1c8e0d6a
      Idan Kamara authored
      When the strip command is run, it calls repo.destroyed, which in turn checks if
      we read _phasecache, and if we did calls filterunknown on it and flushes the
      changes immediately. But in some cases, nothing causes _phasecache to be read,
      so we miss out on this and the file remains the same on-disk.
      
      Then a call to invalidate comes, which should refresh _phasecache if it
      changed, but it didn't, so it keeps using the old one with the stripped
      revision which causes an IndexError.
      
      Test written by Yuya Nishihara.
      1c8e0d6a
  9. Mar 19, 2013
  10. Mar 11, 2013
    • Durham Goode's avatar
      rebase: restore active bookmark after rebase --continue · 72412afe
      Durham Goode authored
      When a rebase has conflicts and the user uses rebase --continue, the previously
      active bookmark was not being made active once again. With this change that
      bookmark is made active again, just as if the rebase had never been interrupted.
      
      This changes the rebasestate file format, but should handle old formats correctly.
      Since the file is transient, this is even less of a problem.
      
      Adds a test to verify the new behavior. I manually tested continuing rebases
      with and without an active bookmark, and with and without being on the bookmark
      being rebased.
      72412afe
  11. Mar 04, 2013
  12. Mar 01, 2013
  13. Feb 28, 2013
  14. Feb 17, 2013
    • Katsunori FUJIWARA's avatar
      bundle: treat branches created newly on the local correctly (issue3828) · 61c8327c
      Katsunori FUJIWARA authored
      Before this patch, "hg bundle --branch foo other" fails to create
      bundle file, if specified "foo" branch is created newly on the local
      repository.
      
      "hg bundle" uses "hg.addbranchrevs(repo, other, ...)" to look branch
      names up, even though other outgoing-like implementation uses
      "hg.addbranchrevs(repo, repo, ...)". In the former invocation, "other"
      repository recognizes such branches as unknown, so execution is
      aborted.
      
      This patch uses "hg.addbranchrevs(repo, repo, ..)" in "hg bundle" to
      bundle revisions on such branches correctly.
      61c8327c
  15. Feb 15, 2013
    • Kevin Bullock's avatar
      mergetools: refine vimdiff warning message · 7d66a44e
      Kevin Bullock authored
      We explicitly redraw before echoing the message so that it simply
      displays at the bottom of the window. Also simplifies the message
      printing by using 'echomsg' (which uses 'echohl' internally) and adds
      the names of the software involved for improved Googleability.
      7d66a44e
    • Pierre-Yves David's avatar
      mergetools: vimdiff issue a warning explaining how to abort · f2b1f78c
      Pierre-Yves David authored
      Adds a message displayed at each vimdiff invocation:
      
        merge conflict detected, type ":cq" to abort
      
      Vimdiff is very confusing for non-vim user (not to speak about vim user confused
      anyway. However it is very likely that vimdiff is picked as the mergetool of
      choice when using the default config:
      - vim is available on all UNIX system.
      - Its one of the rare non graphical merge tools.
      f2b1f78c
  16. Feb 13, 2013
  17. Feb 09, 2013
  18. Feb 08, 2013
  19. Feb 05, 2013
  20. Feb 06, 2013
    • Pierre-Yves David's avatar
      incoming: fix incoming when a local head is remotely filtered (issue3805) · cd403d6d
      Pierre-Yves David authored
      In its current state discovery may return (remotely) filtered elements
      in "common". This has usually no impact as "missing" is kept clear of
      filtered elements. However when the "remote" repo is a local repo (disk
      accessible, and directly created in memory) the incoming code takes a
      shortcut and directly uses the "remote" repo to generate the incoming
      output. When some common elements are filtered this led to a crash. We
      now ensure we use an unfiltered repository to generate the incoming
      output. This does not change the behavior as missing is clear of
      filtered revision.
      
      Now that we have proper low level filtering, incoming code needs a
      deeper cleanup but it is already planned.
      cd403d6d
  21. Feb 05, 2013
  22. Feb 04, 2013
Loading