Skip to content
Snippets Groups Projects
  1. Jun 08, 2018
    • Yuya Nishihara's avatar
      formatter: provide hint of context keys required by template · 8399438b
      Yuya Nishihara authored
      This allows us to create ctx objects only if necessary.
      
      I tried another idea which is to populate ctx from 'repo' and 'node' value
      on demand. It worked, but seemed unnecessarily complicated. So I chose a
      simpler one.
      
      The datafields argument is a space-separated string for consistency with
      fm.write() API.
      8399438b
  2. Jun 14, 2018
  3. Jun 21, 2018
  4. Jun 19, 2018
    • Yuya Nishihara's avatar
      merge: do not fill manifest of committed revision with pseudo node (issue5526) · 1322ae04
      Yuya Nishihara authored
      Since a75d24539aba "convert: fix convert dropping p2 contents during filemap
      merge", wctx is not always a committablectx because the convert extension
      passes in repo[n] as wctx. If wctx is a committed changeset, its manifest
      dict shouldn't be mutated reflecting to the working directory.
      1322ae04
    • Martin von Zweigbergk's avatar
      split: preserve phase of commit that is being split · 4f885770
      Martin von Zweigbergk authored
      With this change, hg split will preserve the phase of the commit that is being
      split, ignoring the phases.new-commit setting. Previously, we would use whatever
      phases.new-commit was set to (unless our parent was secret, then we would be
      secret even if phases.new-commit=draft).
      
      Now, splitting a draft commit with phases.new-commit=secret does not cause the
      new commits to become secret, and splitting a secret commit with
      phases.new-commit=draft and a draft parent does not cause the new commits to
      become draft.
      
      Test cases and commit message taken from Kyle Lippincott's D2016 (thanks!).
      
      Differential Revision: https://phab.mercurial-scm.org/D3819
      4f885770
    • Martin von Zweigbergk's avatar
      scmutil: make cleanupnodes optionally also fix the phase · 32fba6fe
      Martin von Zweigbergk authored
      We have had multiple bugs where the phase wasn't correctly carried
      forward to a rewritten changeset (for example: phabricator, split,
      evolve, fix). Handling the phase update in cleanupnodes() makes it
      less likely to happen again, especially once we have made it fix the
      phase by default (perhaps in the next release cycle).
      
      This patch also updates all applicable callers so we get some testing
      of it.
      
      Note that rebase and histedit can't be fixed yet because they call
      cleanupnodes() only at the end and the phase may have been changed by
      the user when the rebase/histedit was interrupted (due to merge
      conflicts). I think we should make them write one commit at a time (as
      it already does), along with associated obsmarkers, bookmark moves,
      etc. When that's done, we can switch them over to cleanupnodes().
      
      Differential Revision: https://phab.mercurial-scm.org/D3818
      32fba6fe
    • Martin von Zweigbergk's avatar
      tests: add test of uncommit with default phase as secret · a6addfd6
      Martin von Zweigbergk authored
      We didn't seem to have any test checking that uncommitting a draft
      commit with phase.new-phase=secret preserved the draft phase.
      
      Differential Revision: https://phab.mercurial-scm.org/D3817
      a6addfd6
  5. Jun 17, 2018
    • Sangeet Kumar Mishra's avatar
      grep: add --diff flag · 7fbb5d76
      Sangeet Kumar Mishra authored
      Adds a diff flag, which works exactly same as all, in fact since
      --all searches diffs, there diff is a better name for it.
      The all flag is still here for backward compatibility reasons.
      Some major tests for all has been picked and added for diff.
      
      Differential Revision: https://phab.mercurial-scm.org/D3763
      7fbb5d76
  6. Jun 20, 2018
  7. Jun 19, 2018
  8. Jun 21, 2018
  9. Jun 19, 2018
    • Matti Hämäläinen's avatar
      crecord: re-center display in interactive curses commit on pageup/down · 96871ca3
      Matti Hämäläinen authored
      A long-standing issue in the crecord (interactive curses commit interface)
      is that using PageUp/Down to move along longer-than current screen size
      chunks would "lose" the cursor and not properly re-center.
      
      There has been self.recenterdisplayedarea() to do that, but it has not been
      in use for some reason. Add calls to the appropriate uparrowshiftevent()
      and downarrowshiftevent() methods to fix this.
      96871ca3
  10. Feb 02, 2018
  11. Jun 18, 2018
  12. Jun 03, 2018
  13. May 31, 2018
Loading