Skip to content
Snippets Groups Projects
  1. Apr 14, 2015
    • Martin von Zweigbergk's avatar
      treemanifest: store submanifest revlog per directory · b5052fc7
      Martin von Zweigbergk authored
      With this change, when tree manifests are enabled (in .hg/requires),
      commits will be written with one manifest revlog per directory. The
      manifest revlogs are stored in
      .hg/store/meta/$dir/00manifest.[id].
      
      Flat manifests can still be read and interacted with as usual (they
      are also read into treemanifest instances). The functionality for
      writing treemanifest as a flat manifest to disk is still left in the
      code; tests still pass with '_treeinmem=True' hardcoded.
      
      Exchange is not yet implemented.
      b5052fc7
  2. May 15, 2015
  3. May 14, 2015
  4. May 10, 2015
    • Jordi Gutiérrez Hermoso's avatar
      rebase: clear merge when aborting before any rebasing (issue4661) · bd98d073
      Jordi Gutiérrez Hermoso authored
      The check of the inrebase function was not correct, and it failed to
      consider the situation in which nothing has been rebased yet, *and*
      the working dir had been updated away from the initial revision.
      
      But this is easy to fix. Given the rebase state, we know exactly where
      we should be standing: on the first unrebased commit. We check that
      instead. I also took the liberty to rename the function, as "inrebase"
      doesn't really describe the situation: we could still be in a rebase
      state yet the user somehow forcibly updated to a different revision.
      
      We also check that we're in a merge state, since an interrupted merge
      is the only "safe" way to interrupt a rebase. If the rebase got
      interrupted by power loss or whatever (so there's no merge state),
      it's still safer to not blow away the working directory.
      bd98d073
    • Jordi Gutiérrez Hermoso's avatar
      test-rebase-abort: add test from issue4009 · 01ad8daa
      Jordi Gutiérrez Hermoso authored
      The fix for issue4009, namely fe78eb7bcca0, introduced issue4661.
      Let's make sure that the fix for issue4661 will not reintroduce
      issue4009.
      01ad8daa
  5. May 08, 2015
  6. May 13, 2015
    • Katsunori FUJIWARA's avatar
      import-checker: loop to get list of locally defined modules at first · 3bbbadf6
      Katsunori FUJIWARA authored
      This is a preparation for subsequent patches, which expect that all
      locally defined (= mercurial specific) modules are already known
      before examinations.
      
      Looping twice for specified modules is a little redundant, but
      reasonable cost for improvement in subsequent patches.
      3bbbadf6
    • Katsunori FUJIWARA's avatar
      import-checker: add xargs like mode · 723e3644
      Katsunori FUJIWARA authored
      Before this patch, "import-check.py" is invoked via "xargs" in
      "test-module-imports.t", but it doesn't ensure that
      "import-checker.py" is certainly invoked with all mercurial specific
      files at once.
      
      "xargs" may invoke specified command multiple times with part of
      arguments given from stdin: according to "xargs(1)" man page, this
      dividing arguments is system-dependent.
      
      This patch adds "xargs" like mode to "import-checker.py".
      
      This can ensure that "import-checker.py" is certainly invoked with all
      mercurial specific files at once in "test-module-imports.t". This is
      assumed by subsequent patches.
      723e3644
    • Adrian Buehlmann's avatar
  7. Apr 14, 2015
  8. Apr 13, 2015
  9. Apr 14, 2015
Loading