Skip to content
Snippets Groups Projects
  1. Oct 05, 2017
    • Durham Goode's avatar
      context: update to work with upstream · 5821075b
      Durham Goode authored
      Some upstream code now relies on ctx.repo() to access the repo object, since
      hggit stored ctx.repo as a field instead of a function, that failed. Let's move
      it to be a function.
      
      For overlaychangectx we can't just store the repo in self._repo because that
      causes other parts of the base class to act differently and causes tests to
      fail, so we store it as a new field.
      5821075b
  2. Oct 01, 2017
  3. Aug 17, 2017
  4. Aug 10, 2017
  5. Aug 04, 2017
    • Katsunori FUJIWARA's avatar
      gitdirstate: show pattern error in hgignore file as expected · cf982a23
      Katsunori FUJIWARA authored
      Before this revision, invalid pattern in hgignore file causes
      unintentional failure for UnboundLocalError of ignorefunc, if hggit is
      used with Mercurial 3.5 or later.
      
      In such case:
      
        - checking source of invalid pattern at failure uses "pats" list for
          hgignore files, but
      
        - "pats" list is empty, if ignoremod is None (= Mercurial 3.5 or later)
      
        - therefore, checking with matchmod.match() overlooks invalid pattern
      
      Then, "return ignorefunc" is executed without assignment to
      ignorefunc, and causes UnboundLocalError.
      
      To show pattern error in hgignore file as expected even with Mercurial
      3.5 or later, this revision puts '(FILE, ["include: FILE"])' tuples
      into "pats" (to avoid code duplication, putting into allpats is
      shared, too).
      
      This makes checking source of invalid pattern at failure work as
      expected for hgignore files.
      
      Fixes #197
      cf982a23
  6. Aug 10, 2017
  7. Aug 04, 2017
  8. Aug 07, 2017
  9. Aug 06, 2017
  10. Aug 05, 2017
  11. Aug 06, 2017
  12. Aug 05, 2017
  13. Jul 24, 2017
  14. Jul 19, 2017
    • Ryan McElroy's avatar
      bookmarks: compatibility with new applychanges api · 078c3912
      Ryan McElroy authored
      Recent versions of mercuiral issue a devel-warn if the old recordchange api is
      used, but we want to remain backwards-compatible, so this patch refactors things
      to be forward-compatible and backwards-compatible.
      078c3912
  15. Jul 17, 2017
    • Durham Goode's avatar
      wlock: take wlock when writing map file · 78959c8e
      Durham Goode authored
      Upstream Mercurial now has a devel-warning when writing to a file without taking
      a lock. Since we already need write access to write the map file, let's take the
      wlock as well.
      78959c8e
  16. Jun 19, 2017
    • Kevin Bullock's avatar
      gitdirstate: use util.listdir if available · 006c837f
      Kevin Bullock authored
      Since hg 4.3, the upstream osutil module has been moved to
      mercurial.cext.osutil, but the util module also now re-exports
      everything in osutil.
      
      Thanks to Durham Goode and Yuya Nishihara for reporting and finding the
      right fix for this.
      006c837f
  17. Jun 09, 2017
    • Stanislau Hlebik's avatar
      git_handler: explicitly set default branch · 17f64b9b
      Stanislau Hlebik authored
      In upstream c0b16b801687be26d14cabe501678e24b2a3c117 there was a refactoring
      that caused current named branch to be set if branch wasn't specified. It makes
      hg-git tests fail. This diff fixes it by explicitly specifying default named
      branch.
      17f64b9b
  18. May 22, 2017
  19. May 12, 2017
  20. May 09, 2017
    • Durham Goode's avatar
      vfs: stop using repo.join/wjoin · 715cbf3f
      Durham Goode authored
      Mercurial 4.3 has completelu dropped the join and wjoin functions. Let's use the
      appropriate repo.vfs.join and repo.wvfs.join functions instead.
      
      I ran the tests against each version of Mercurial from 2.8 to 4.2. Things
      before 2.8 seem to already be broken for unrelated reasons.
      715cbf3f
  21. Apr 19, 2017
  22. Mar 15, 2017
    • Durham Goode's avatar
      repo: update repo.join to be repo.vfs.join · 78354607
      Durham Goode authored
      Upstream has deprecated repo.join in favor of repo.vfs.join, so let's update to
      match them. Old hg should have repo.vfs.join so I don't think this breaks
      backwards compatibility.
      78354607
Loading