1. 09 Apr, 2020 1 commit
    • Pulkit Goyal's avatar
      mergestate: store about files resolved in favour of other · 1b8fd4af3318
      Pulkit Goyal authored
      Committing a merge sometimes wrongly creates a new filenode where it can re-use
      an existing one. This happens because the commit code does it's own calculation
      and does not know what happened on merge.
      
      This starts storing information in mergestate about files which were
      automatically merged and the other/remote version of file was used.
      We need this information at commit to pick the filenode parent for the new
      commit.
      
      This issue was found by Pierre-Yves David and idea to store the relevant parts
      in mergestate is also suggested by him.
      
      Somethings which can be further investigated are:
      
      1) refactoring of commit logic more to depend on this information
      2) maybe a more generic solution?
      
      Differential Revision: https://phab.mercurial-scm.org/D8392
      1b8fd4af3318
  2. 01 Mar, 2020 1 commit
    • Manuel Jacob's avatar
      branch: make --force work even when specifying revs · 92b7caf4cb9e
      Manuel Jacob authored
      The `hg branch` command accepts a `--force` parameter that allows to
      "set branch name even if it shadows an existing branch". However, before this
      patch, that didn’t work when specifying revs with `-r`.
      
      --HG--
      branch : stable
      92b7caf4cb9e
  3. 23 Mar, 2020 1 commit
  4. 25 Jan, 2020 1 commit
  5. 22 Jan, 2020 1 commit
  6. 28 Dec, 2019 2 commits
  7. 30 Dec, 2019 1 commit
  8. 27 Dec, 2019 1 commit
  9. 12 Dec, 2019 1 commit
    • Martin von Zweigbergk's avatar
      config: drop debug messages saying where config was read from · 6b6872822b32
      Martin von Zweigbergk authored
      `hg config --debug` includes lines like this:
      
        set config by: $EDITOR
      
      but also lines like this:
      
        $EDITOR: ui.editor=emacs -nw
      
      The `set config by` messages don't seem to provide much additional
      information over what we get from the `$EDITOR:`-type message. I could
      imagine wanting to see which values got overriden by a later entry,
      but that information is already not present. So let's just remove the
      first type of output. My next patch would otherwise amplify the
      redundant output (there would be one `set config by` for each line in
      `mergetools.rc`).
      
      Differential Revision: https://phab.mercurial-scm.org/D7627
      6b6872822b32
  10. 13 Dec, 2019 3 commits
  11. 12 Dec, 2019 4 commits
  12. 10 Dec, 2019 3 commits
  13. 27 Oct, 2019 2 commits
  14. 05 Dec, 2019 1 commit
  15. 18 Oct, 2019 1 commit
  16. 06 Oct, 2019 1 commit
    • Sushil Khanchi's avatar
      grep: enable all-files by default (BC) · 8cb5f96db235
      Sushil Khanchi authored
      This patch deprecates the `--all-files` flag and make the all-files
      behaviour as default.
      
      In test-grep.t, I removed '--all-files' from every command where it was
      used, to reflect that all-files behaviour is default and there is no
      change even after the removal.
      And other changes in test files are because of changed behaviour.
      
      Differential Revision: https://phab.mercurial-scm.org/D7000
      
      .. bc::
      
          `hg grep` now searches working copy file contents by default. We
          recognize this is a significant change from past behavior, but
          surveys of large bodies of users indicated nobody used (and almost
          nobody understood) the previous no-flags behavior of `hg
          grep`. The new behavior aligns with the behavior most users
          expected (including hg's maintainers), which also happens to be
          the behavior of `git grep`. Given that the old behavior was
          confusing to the point of being unusable, we were comfortable
          changing this behavior.
      8cb5f96db235
  17. 21 Nov, 2019 1 commit
    • Denis Laxalde's avatar
      import: add a --secret option · 71dbd6f6fcb8
      Denis Laxalde authored
      Similarly to "hg commit", we add a --secret option to "hg import" for
      committing with the secret phase. The option has no short form since
      there already is a "-s" for "--similarity".
      
      .. feature::
      
         ``hg import`` has a new --secret option for committing with the
          secret phase.
      71dbd6f6fcb8
  18. 14 Nov, 2019 2 commits
  19. 06 Oct, 2019 1 commit
  20. 19 Oct, 2019 1 commit
  21. 08 Nov, 2019 2 commits
    • Kyle Lippincott's avatar
      unshelve: correct help string; unshelve does not accept file list · 8e175a3d64bd
      Kyle Lippincott authored
      The non-option arguments to `hg unshelve` are interpreted as the name of the
      shelve to unshelve, not the list of files to unshelve. While that functionality
      would probably be nice to have, that's well beyond the scope of this
      documentation fix.
      
      Differential Revision: https://phab.mercurial-scm.org/D7365
      8e175a3d64bd
    • Augie Fackler's avatar
      cleanup: remove pointless r-prefixes on single-quoted strings · 9f70512ae2cf
      Augie Fackler authored
      This is the promised second step on single-quoted strings. These had
      existed because our source transformer didn't turn r'' into b'', so we
      had tagged some strings as r-strings to get "native" strings on both
      Pythons. Now that the transformer is gone, we can dispense with this
      nonsense.
      
      Methodology:
      
      I ran
      
          hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$'  | xargs egrep --color=never -n  -- \[\^b\]\[\^a-z\]r\'\[\^\'\\\\\]\*\'\[\^\'\
      
      in an emacs grep-mode buffer, and then used a keyboard macro to
      iterate over the results and remove the r prefix as needed.
      
      # skip-blame removing unneeded r prefixes left over from Python 3 migration.
      
      Differential Revision: https://phab.mercurial-scm.org/D7306
      9f70512ae2cf
  22. 23 Jul, 2019 1 commit
  23. 18 Jul, 2019 3 commits
  24. 03 Jul, 2019 2 commits
  25. 02 Jul, 2019 1 commit
  26. 17 Jul, 2019 1 commit
    • Taapas Agrawal's avatar
      continue: added support for unshelve · 117437f3f541
      Taapas Agrawal authored
      This patch adds the support for `ushelve` in `hg continue` plan.
      
      `hgcontinueunshelve()` has been created for independent calls.
      In case an interrupted unshelve is resumed via hg continue the
      shelvedstate needs to be loaded seperately. This has been
      ensured by `_loadunshelvedstate()`
      
      `hgcontinueunshelve()` is then registered as `continuefunc` for state
      detection API.
      
      Results are shown as tests.
      
      Differential Revision: https://phab.mercurial-scm.org/D6652
      117437f3f541