Skip to content
Snippets Groups Projects
  1. Apr 28, 2014
  2. Apr 29, 2014
    • Pierre-Yves David's avatar
      graft: do not use `.remove` on a smart set (regression) · a1381eea7c7d
      Pierre-Yves David authored
      Revset calls use to return a list. Graft use to mutate that list. We cannot do
      this anymore leading to a crash when grafting multiple changeset with a revset.
      
          File ".../mercurial/commands.py", line 3117, in graft
            revs.remove(rev)
          AttributeError: '_addset' object has no attribute 'remove'
      
      We are late in code-freeze so we make the shortest possible fix by turning it
      back to a list.
      a1381eea7c7d
  3. Apr 28, 2014
    • Greg Hurrell's avatar
      help: clarify distinction among `contains`/`file`/`filelog` · e9c2f76be74b
      Greg Hurrell authored
      For a Mercurial new-comer, the distinction between `contains(x)`,
      `file(x)`, and `filelog(x)` in the "revsets" help page may not be
      obvious. This commit tries to make things more obvious (text based on
      an explanation from Matt in an FB group thread).
      e9c2f76be74b
  4. Apr 24, 2014
  5. Apr 23, 2014
  6. Apr 26, 2014
    • Matt Harbison's avatar
    • Yuya Nishihara's avatar
      cmdserver: forcibly use L channel to read password input (issue3161) · 9336bc7dca8e
      Yuya Nishihara authored
      Command server is designed to use the channel protocol even if the server
      process is accessible to tty, whereas vanilla hg should be able to read
      password from tty in that case.  So it isn't enough to swap sys.stdin:
      
          # works only if the server process is detached from the console
          sys.stdin = self.fin
          getpass.getpass('')
          sys.stdin = oldin
      
      or test isatty:
      
          # vanilla hg can't talk to tty if stdin is redirected
          if self._isatty(self.fin):
              return getpass.getpass('')
          else:
              ...
      
      Since ui.nontty flag is undocumented and command-server channels don't provide
      isatty(), this change won't affect the other uses of ui._isatty().
      
      issue3161 also suggests to provide some context of messages.  I think it can
      be implemented by using the generic templating function.
      9336bc7dca8e
  7. Apr 29, 2014
  8. Apr 27, 2014
  9. Apr 23, 2014
  10. Apr 21, 2014
    • Pierre-Yves David's avatar
      bundle2: gracefully handle hook abort · bcfd44abad93
      Pierre-Yves David authored
      We make sure any exceptions raised during the whole span of handling bundle2
      processing are decorated. This let us catch exceptions raised by hooks prior to
      transaction commit.
      bcfd44abad93
  11. Apr 22, 2014
  12. Apr 21, 2014
  13. Apr 22, 2014
  14. Apr 21, 2014
  15. Apr 22, 2014
  16. Apr 21, 2014
  17. Apr 18, 2014
    • Mads Kiilerich's avatar
      merge: tell the user when we are using bid merge · 33737ebc6f39
      Mads Kiilerich authored
      Bid merge is a new rarely used feature that the user explicitly enabled - we
      should tell/warn when the user actually is using it, just like we tell when we
      not are using it.
      
      Give a message like
        note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
      33737ebc6f39
  18. Apr 21, 2014
  19. Apr 19, 2014
  20. Apr 17, 2014
Loading