Skip to content
Snippets Groups Projects
  1. Apr 28, 2015
  2. Apr 27, 2015
    • Laurent Charignon's avatar
      revert: make the interactive mode experimental · 12908cdbab73
      Laurent Charignon authored
      While fixing issue4304: "record: allow editing new files" we introduced
      changes in record/crecord. These changes need to be matched with changes in any
      command using record. Revert is one of these commands and the changes have
      not been made for this release. Therefore, revert -i should be an experimental
      feature for this release.
      12908cdbab73
    • Laurent Charignon's avatar
      shelve: make the interactive mode experimental · 3510ec97ffdc
      Laurent Charignon authored
      While fixing issue4304: "record: allow editing new files" we introduced
      changes in record/crecord. These changes need to be matched with changes in any
      command using record. Shelve is one of these commands and the changes have
      not been made for this release. Therefore, shelve -i should be an experimental
      feature for this release.
      3510ec97ffdc
    • Siddharth Agarwal's avatar
      help: also hide options marked EXPERIMENTAL · 117b9a101f71
      Siddharth Agarwal authored
      Similar to DEPRECATED, add a way to indicate that options are EXPERIMENTAL.
      117b9a101f71
  3. Apr 28, 2015
    • Gregory Szorc's avatar
      rebase: don't forward "source" argument to rebase (issue4633) · 4ec40a4db64a
      Gregory Szorc authored
      `hg pull` takes an optional "source" argument to define the path/url to
      pull from. Under some circumstances, this option could get proxied to
      rebase and interpretted as the --source argument to rebase, leading to
      unexpected behavior.
      
      In my local environment, "source" always appears in "opts" in
      pullrebase. However, when attempting to write a test, I couldn't reproduce
      this. Instead, the source is being captured as a positional argument in
      "args." I suspect an interaction between **kwargs and an extension is to
      blame for the differences in behavior. This is why no test has been
      written.
      
      I have tested behavior locally and the patch has the intended
      side-effect of making `hg pull --rebase` work again.
      4ec40a4db64a
    • Katsunori FUJIWARA's avatar
      histedit: fix reST syntax problem of example code in help document · 95a67d687903
      Katsunori FUJIWARA authored
      To show example code correctly in online help, text block of it should
      be preceded by "::" and indented.
      95a67d687903
  4. Apr 27, 2015
  5. Apr 25, 2015
  6. Apr 26, 2015
  7. Apr 27, 2015
    • Katsunori FUJIWARA's avatar
      i18n: extract doc string of each web commands as translatable one · 64e3f97bdf08
      Katsunori FUJIWARA authored
      Before this patch, doc string of each web commands isn't extracted as
      translatable one, even though web commands are listed up in "hg help
      hgweb".
      
      This patch adds "mercurial/hgweb/webcommands.py" on to arguments of
      "i18n/hggettext". "i18nfunctions" added into "webcommands.py" is used
      by "i18n/hggettext" to get the list of functions having translatable
      doc string.
      64e3f97bdf08
  8. Apr 25, 2015
    • Matt Harbison's avatar
      subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622) · a99931201d1b
      Matt Harbison authored
      The '' that is used to represent the state of a not-yet-committed
      subrepo cannot be written to the file, because the code that parses
      the file splits on ' ' and expects two parts.
      
      Given that the .hgsubstate file is automatically rewritten on commit, it seems
      a little strange that the file is written out during a merge.
      a99931201d1b
  9. Apr 26, 2015
  10. Apr 27, 2015
  11. Apr 24, 2015
  12. Apr 23, 2015
  13. Apr 24, 2015
  14. Apr 23, 2015
    • Pierre-Yves David's avatar
      bundle2: also save output when error happens during part processing · df0ce98c882f
      Pierre-Yves David authored
      Until this changeset, we were only able to save output if an error happened
      during the 'transaction.close()' phase. If the 'processbundle' call raised an
      exception, the 'bundleoperation' object was never returned, so the reply bundle
      was never accessible and no output could be salvaged. We introduce a quick (but
      not very elegant) fix to gain access to any reply created during the processing.
      
      This conclude this output related series. We should hopefully be able client-side to see the
      whole server output, in a proper order.
      
      The code is now complex enough that a refactoring of it would make sense on
      default.
      df0ce98c882f
    • Pierre-Yves David's avatar
      bundle2: capture output issue during transaction close · 6b81309d15a7
      Pierre-Yves David authored
      We were capturing all output issue during bundle2 processing, and all output
      issue during transaction rollback in case of failure. However, the output issue
      during transaction commit was still roaming the land freely. It is now put back
      in line.
      
      This let the user see output from 'pretxnclose' and 'txnclose' (and related) in
      the right order.
      6b81309d15a7
    • Pierre-Yves David's avatar
      bundle2: also capture hook output during processing · aff2aca3420e
      Pierre-Yves David authored
      External hook used to directly write on stdout and stderr. As a result their
      output was not captured by the bundle2 processing. This resulted in confusing
      out of order output on the client side. We are now capturing hooks output in
      this context.
      aff2aca3420e
    • Pierre-Yves David's avatar
      ui: allow capture of subprocess output · 2f88821856eb
      Pierre-Yves David authored
      We want to capture hooks output during bundle2 processing. For this purpose we
      introduce a new 'subproc' argument to 'ui.pushbuffer'. When set, the output of
      sub process created through 'ui.system' will be captured in the buffer too.
      
      This will be used in the next changeset.
      2f88821856eb
    • Pierre-Yves David's avatar
      bundle2: capture transaction rollback message output (issue4614) · b705e5ab3b07
      Pierre-Yves David authored
      The output from the transaction rollback was not included into the reply bundle.
      It was eventually caught by the usual 'unbundle' output capture and sent to the
      client but the result was out of order on the client side. We now capture the
      output for the transaction release and transmit it the same way as all other
      output.
      
      We should probably rethink the whole output capture things but this would not be
      appropriate for stable.
      
      The is still multiple cases were output failed to be properly capture, they will
      be fixed in later changesets.
      b705e5ab3b07
    • Pierre-Yves David's avatar
      bundle2: issue remote output as "status" (issue4612) · e79dd1c9753e
      Pierre-Yves David authored
      Remote output should be silenced by --quiet. The issue was found while running
      `test-largefiles-cache.t` so it will get tested once we switch bundle2 by
      default.
      e79dd1c9753e
    • Laurent Charignon's avatar
      record: edit patch of newly added files (issue4304) · 8133494accf1
      Laurent Charignon authored
      I tried to fix this issue in the past and had to revert the fix. This is a
      second attempt without the regression we found with the first one.
      
      record defines special headers (of file) as headers whose hunk are not shown
      to the user for editing, they are used to represent deleted, moved and new
      files. Since we want to authorize editing the patch of newly added file we
      make the newly added file with some content not special anymore. This entails
      that we have to save their content before applying the backup to be able to
      revert it if the patch does not apply properly.
      We reintroduce the test showing that newly added files can be edited and that
      their content is shown to the user.
      8133494accf1
    • Laurent Charignon's avatar
      record: remove useless line in test · 6c6aee6d395b
      Laurent Charignon authored
      Remove a useless line in test to make the next patch cleaner.
      6c6aee6d395b
  15. Apr 24, 2015
    • Katsunori FUJIWARA's avatar
      revert: apply normallookup on reverted file if size isn't changed (issue4583) · 21b33f0460e0
      Katsunori FUJIWARA authored
      Before this patch, reverting a file to the revision other than the
      parent doesn't update dirstate. This seems to expect that timestamp
      and/or size will be changed by reverting.
      
      But if (1) dirstate of file "f" is filled with timestamp before
      reverting and (2) size and timestamp of file "f" isn't changed at
      reverting, file "f" is recognized as CLEAN unexpectedly.
      
      This patch applies "dirstate.normallookup()" on reverted file, if size
      isn't changed.
      
      Making "localrepository.wwrite()" return length of written data is
      needed to avoid additional (and redundant) "lstat(2)" on the reverted
      file. "filectx.size()" can't be used to know it, because data may be
      decoded at being written out.
      
      BTW, interactive reverting may cause similar problem, too. But this
      patch doesn't focus on fixing it, because (1) interactive (maybe slow)
      reverting changes one (or both) of size/timestamp of reverted files in
      many usecases, and (2) changes to fix it seems not suitable for stable
      branch.
      21b33f0460e0
  16. Apr 23, 2015
  17. Apr 22, 2015
    • Martin von Zweigbergk's avatar
      revert: accept just -I/-X without paths or -a/-i (issue4592) · 45bd336e3991
      Martin von Zweigbergk authored
      'hg revert -I foo' currently fails with
      
        abort: no files or directories specified
        (use --all to revert all files, or 'hg update 1' to update)
      
      It doesn't seem intentional that -I/-X without other paths or
      --all/--interactive should fail, and it doesn't seem that harmful to
      allow it either, so let's just do that.
      45bd336e3991
  18. Apr 21, 2015
    • Laurent Charignon's avatar
      record: change wording for record curses interface · a5e3634ba024
      Laurent Charignon authored
      We are using record and crecord in different context, not just for commiting
      changes but also reverting and shelving changes. This diff changes the wording
      from commiting to confirming changes to avoid confusing the users with what
      they are doing.
      a5e3634ba024
  19. Apr 23, 2015
    • Yuya Nishihara's avatar
      wix: remove cacert.pem from Windows distribution · 6e38b6fc4123
      Yuya Nishihara authored
      It should not be included in the Windows installers because it prevents
      loading CA certificates from the system store on Python 2.7.9, implemented
      by 760a86865f80. The msi packages bundles Python 2.7.9, so cacert.pem is no
      longer necessary.
      
      Backed out changeset e5c2338d76b5
      6e38b6fc4123
    • Katsunori FUJIWARA's avatar
      tests: use double quote to quote arguments in hook for portability · b2c1ff96c1e1
      Katsunori FUJIWARA authored
      On windows, single quote doesn't work as quote character in hook
      command line, because "cmd.exe" doesn't recognize it as quoting
      character. And this causes failure of test.
      
      This patch uses double quote to quote arguments in hook instead of
      single quote for portability.
      
      Even though single quotes for "[hooks] pretxncommit" in
      test-clone-pull-corruption.t seems to work correctly (may MinGW sh
      treat specially ?) AFAIK, this patch also replaces them by double
      quotes for consistency.
      b2c1ff96c1e1
  20. Apr 22, 2015
Loading