Skip to content
Snippets Groups Projects
  1. Mar 25, 2018
  2. Mar 24, 2018
  3. Mar 25, 2018
  4. Mar 06, 2018
    • Gregory Szorc's avatar
      commands: use constants for merge things · 704932ef
      Gregory Szorc authored
      We have nice constants now. Let's use them to make the code
      easier to reason about.
      
      Differential Revision: https://phab.mercurial-scm.org/D2702
      704932ef
    • Gregory Szorc's avatar
      merge: use constants for actions · 43ffd907
      Gregory Szorc authored
      We finish up establishing named constants in this file with
      actions.
      
      I remember scratching my head trying to figure out what this
      code was doing as part of addressing a recent security issue with
      subrepos. Having the named constants in place definitely makes
      things easier to read.
      
      I'm not convinced the new constants have the best names (I'm not
      an expert in this code). But they can be changed easily enough.
      
      Also, since these constants are internal only, we might want
      to change their values to something more human readable to
      facilitate debugging. Or maybe we could employ an enum type
      some day...
      
      Differential Revision: https://phab.mercurial-scm.org/D2701
      43ffd907
  5. Mar 05, 2018
  6. Feb 23, 2018
  7. Mar 17, 2018
  8. Mar 15, 2018
  9. Mar 24, 2018
  10. Mar 23, 2018
  11. Mar 12, 2018
    • Pulkit Goyal's avatar
      remotenames: show remote bookmarks in `hg bookmarks` · a61fff49
      Pulkit Goyal authored
      This patch adds functionality to show list of remote bookmarks in `hg bookmarks`
      command.
      
      There is some indenting problem in the test output as the current bookmark
      printing code in core can handle bookmark names of size 25 only gracefully.
      
      The idea is taken from hgremotenames extension which has --remote and --all
      flags to show remote bookmarks. However, this patch by defaults support showing
      list of remote bookmarks if remotenames extension is enabled and remotebookmarks
      are turned on.
      
      Differential Revision: https://phab.mercurial-scm.org/D2808
      a61fff49
  12. Mar 11, 2018
    • Pulkit Goyal's avatar
      remotenames: add functionality to hoist remotebookmarks · 9938992c
      Pulkit Goyal authored
      This patch adds the functionality to hoist remotebookmarks to the top level
      namespace. The peer of which bookmarks should be hoisted can be set using
      `remotenames.hoistedpeer` config option. Only bookmarks can be hoisted. If a
      hoisted name and local bookmark exists of the same name, the local bookmark
      takes precedence.
      
      While I was here, I documented the default values of two other remotenames
      config options.
      
      Differential Revision: https://phab.mercurial-scm.org/D2807
      9938992c
  13. Mar 08, 2018
  14. Mar 23, 2018
  15. Mar 22, 2018
Loading