Skip to content
Snippets Groups Projects
  1. Nov 01, 2012
  2. Oct 31, 2012
  3. Nov 01, 2012
  4. Oct 31, 2012
  5. Oct 24, 2012
    • Simon Heimberg's avatar
      subrepo: only do clean update when overwrite is set (issue3276) · 17c030014ddf
      Simon Heimberg authored
      Files in a subrepo were overwritten on update. But this should only happen on a
      clean update (example: -C is specified).
      Use the overwrite parameter introduced for svn subrepos in c19b9282d3a7 to
      decide whether to merge changes (as update) or remove them (as clean).
      
      The new function hg.updaterepo is intruduced to keep all update calls in hg.
      
      test-subrepo.t is extended to test if an untracked file is overwritten
      (issue3276). (Update -C is already tested in many places.)
      The first two chunks are debugging output which has changed. (Because overwrite
      is not always true anymore for subrepos)
      All other tests still pass without any change.
      17c030014ddf
  6. Oct 30, 2012
  7. Oct 31, 2012
    • Katsunori FUJIWARA's avatar
      icasefs: make case-folding collision detection as deletion aware (issue3648) · ce7bc04d863b
      Katsunori FUJIWARA authored
      Before this patch, case-folding collision is checked simply between
      manifests of each merged revisions.
      
      So, files may be considered as colliding each other, even though one
      of them is already deleted on one of merged branches: in such case,
      merge causes deleting it, so case-folding collision doesn't occur.
      
      This patch checks whether both of files colliding each other still
      remain after merge or not, and ignores collision if at least one of
      them is deleted by merge.
      
      In the case that one of colliding files is deleted on one of merged
      branches and changed on another, file is considered to still remain
      after merge, even though it may be deleted by merge, if "deleting" of
      it is chosen in "manifestmerge()".
      
      This avoids fail to merge by case-folding collisions after choices
      from "changing" and "deleting" of files.
      
      This patch adds only tests for "removed remotely" code paths in
      "_remains()", because other ones are tested by existing tests in
      "test-casecollision-merge.t".
      ce7bc04d863b
  8. Oct 30, 2012
    • Durham Goode's avatar
      mq: fix qrefresh case sensitivity (issue3271) · 39b7052b217b
      Durham Goode authored
      When calling qrefresh with filenames, the filenames were being
      treated as case-sensistive on case-insensitive file systems.
      So 'qrefresh foo' would not match file 'Foo', and it failed silently.
      This fix makes it work correctly on case-insensitive file systems.
      
      Previously the matching function was applied directly to the filenames.
      Now we apply the matching function through repo.status, which handles
      the case logic for us. A side effect of using repo.status is that
      if the qrefresh file doesn't exist, there is output stating it
      doesn't exist.
      
      Adds a test to an existing mq refresh case test.
      39b7052b217b
  9. Oct 18, 2012
  10. Oct 30, 2012
  11. Oct 26, 2012
  12. Oct 30, 2012
  13. Oct 23, 2012
  14. Oct 29, 2012
  15. Oct 28, 2012
  16. Oct 24, 2012
    • Bryan O'Sullivan's avatar
      7b0b1da49f15
    • Matt Harbison's avatar
      largefiles: don't copy largefiles from working dir to the store while converting · d1d0140287b8
      Matt Harbison authored
      Previously, if one or more largefiles for a repo being converted were not in the
      usercache, the convert would abort with a reference to the largefile being
      missing (as opposed to the previous patch, where the standin was referenced as
      missing).  This is because commitctx() tries to copy all largefiles to the
      local store, first from the user cache, and if the file isn't found there, from
      the working directory.  No files will exist in the working directory during a
      convert, however.  It is not sufficient to force the source repo to be local
      before proceeding, because clone and pull do not download largefiles by default.
      
      This is slightly less than ideal because while the conversion will now complete,
      it won't be possible to update to revs with missing largefiles unless the user
      intervenes manually, because there is no default path pointing back to the
      source repo.  Ideally these files would be cached during the conversion.
      
      This check could have been done in reposetup.commitctx() instead, but this
      ensures the local store directory is created, which is necessary to enable the
      standin matcher.
      
      The rm -> 'rm -f' change in the test is to temporarily suppress an error
      clearing the cache- as noted, the cache is is not repopulated during convert.
      When that is fixed, this can be changed back and the verification errors will
      disappear too.
      d1d0140287b8
    • Matt Harbison's avatar
      largefiles: respect the rev when reading standins in copytostore() (issue3630) · 92bbb21d4b13
      Matt Harbison authored
      When the rev isn't specified, the standin for the working copy gets read.  But
      convert doesn't update the working copy for each cset it processes, so there is
      no standin and the 'hg convert' would abort complaining about the standin being
      missing.
      
      Note that if the largefile is not in the user cache, 'hg convert' complains
      about the largefile itself missing from the destination repo.
      92bbb21d4b13
  17. Oct 09, 2012
  18. Oct 04, 2012
  19. Jul 28, 2012
  20. Sep 29, 2012
    • Katsunori FUJIWARA's avatar
      subrepo: isolate configuration between each repositories in subrepo tree · 573bec4ab7ba
      Katsunori FUJIWARA authored
      Before this patch, repository local configurations are not isolated
      between repositories in subrepo tree, because "localrepository"
      objects for each subrepositories are created with "ui" instance of the
      parent of each ones.
      
      So, local configuration of the parent or higher repositories are
      visible also in children or lower ones.
      
      This patch uses "baseui" instead of "ui" to create repository object:
      the former contains only global configuration.
      
      This patch also copies 'ui.commitsubrepos' configuration to commit
      recursively in subrepo tree, because it may be set in not
      "repo.baseui" but "repo.ui".
      573bec4ab7ba
  21. Oct 27, 2012
  22. Oct 26, 2012
  23. Oct 25, 2012
    • Pierre-Yves David's avatar
      bookmark: prevent crashing when a successor is unknown locally (issue3680) · daf32ebfde6b
      Pierre-Yves David authored
      The `%ln` revset substitution does not accept unknown node. We prune unknown
      node from potential successors before computing descendants.
      
      This have no impact on the result of this function.
      
      - Descendants of unknown changeset as unknown,
      - all successors of unknown changesets are already return by the call who
        returned those same unknown changesets,
      - unknown changesets are never a valid destination for a bookmark.
      daf32ebfde6b
Loading