1. 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
  2. 25 Jan, 2020 1 commit
  3. 22 Jan, 2020 1 commit
  4. 28 Dec, 2019 2 commits
  5. 30 Dec, 2019 1 commit
  6. 27 Dec, 2019 1 commit
  7. 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
  8. 13 Dec, 2019 3 commits
  9. 12 Dec, 2019 4 commits
  10. 10 Dec, 2019 3 commits
  11. 27 Oct, 2019 2 commits
  12. 05 Dec, 2019 1 commit
  13. 18 Oct, 2019 1 commit
  14. 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
  15. 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
  16. 14 Nov, 2019 2 commits
  17. 06 Oct, 2019 1 commit
  18. 19 Oct, 2019 1 commit
  19. 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
  20. 23 Jul, 2019 1 commit
  21. 18 Jul, 2019 3 commits
  22. 03 Jul, 2019 2 commits
  23. 02 Jul, 2019 1 commit
  24. 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
  25. 15 Jul, 2019 1 commit
    • Taapas Agrawal's avatar
      continue: added logic for hg continue · 3c16b9c0b099
      Taapas Agrawal authored
      This is part of GSoC19 project `Implement abort and
      continue commands`. This patch is part of the continue plan.
      
      This adds the basic logic for hg continue. This command
      aborts an multistep operation like graft, histedit, rebase,
      transplant and unshelve if they are in an unfinished state.
      
      The first part of the logic is determining the unfinished
      operation from the state detection API under statemod.
      This API is extended to support hg continue by adding a method
      to register the abort logic as a function (here continuefunc).
      
      Once the unfinished operation is determined the registered
      logic is used to resume the command in case it is interrupted.
      The benefit of this kind of framework is that any new extension
      developed can support hg continue by registering the command
      and logic under statedetection API.
      
      hg continue currently supports --dry-run/-n flag only.
      It is used to dry run hg abort
      
      Differential Revision: https://phab.mercurial-scm.org/D6645
      3c16b9c0b099
  26. 29 Jun, 2019 1 commit
    • Taapas Agrawal's avatar
      abort: added support for merge · 3bc400ccbf99
      Taapas Agrawal authored
      This adds support of `hg merge --abort` to `hg abort` plan.
      
      This involves refactoring `hg.merge` into two different
      functions removing the abort logic of `merge` from `hg.merge`
      and then creating a seperate `hg.abortmerge` to handle the
      abort logic so that the abortion of merge can be called
      independently.
      
      `hg.abortmerge` is then registered as `abortfunc` for the
      state detection API so that `commands.abort` can use it to
      deal with an unfinished merge operation.
      
      Results are shown as tests.
      
      Differential Revision: https://phab.mercurial-scm.org/D6588
      3bc400ccbf99