Skip to content
Snippets Groups Projects
  1. Feb 10, 2014
  2. Feb 09, 2014
    • Mads Kiilerich's avatar
      merge: don't overwrite file untracked after remove, abort with 'untracked files' · e4d7cbc9
      Mads Kiilerich authored
      Merge could overwrite untracked files and cause data loss.
      
      Instead we now handle the 'local side removed file and has untracked file
      instead' case as the 'other side added file that local has untracked' case:
      
        FILE: untracked file exists
        abort: untracked files in working directory differ from files in requested revision
      
      It could perhaps make sense to create .orig files when overwriting, either
      instead of aborting or when overwriting anyway because of force ... but for now
      we stay consistent with similar cases.
      e4d7cbc9
  3. Feb 05, 2014
  4. Feb 03, 2014
  5. Feb 01, 2014
  6. Jan 31, 2014
  7. Jan 30, 2014
  8. Jan 22, 2014
    • Simon Heimberg's avatar
      i18n-de: updated po file with 427d672c0e4e · a789213c
      Simon Heimberg authored
      Do this in a separate patch for easier reviewing of the translation patch.
      a789213c
    • Simon Heimberg's avatar
      i18n-de: remove locations · 8f63b288
      Simon Heimberg authored
      Strip the locations by running msgcat [1] as the wiki [2] tells to do. Do
      this in a separate patch for getting a smaller one when updating from hg.pot.
      
      [1] msgcat --no-location -o de.po de.po
      [2] mercurial.selenic.com/wiki/TranslatingMercurial#Updating_a_Translation
      8f63b288
  9. Jan 31, 2014
  10. Jan 29, 2014
  11. Jan 30, 2014
    • Pierre-Yves David's avatar
      clone: do not turn hidden changeset public on publishing clone (issue3935) · a959f716
      Pierre-Yves David authored
      Before this changeset local clone of a repo with hidden changeset would include
      then in the clone (why not) and turn them public (plain wrong). This happened
      because the copy clone publish by dropping the phaseroot file entirely making
      everything in the repo public (and therefore immune to obsolescence marker).
      
      This changeset takes the simplest fix, we deny the copy clone in the case of hidden
      changeset falling back to pull clone that will exclude them from the clone and
      therefore not turning them public.
      
      A smarter version of copy clone could be done, but I prefer to go for the
      simplest solution first.
      a959f716
  12. Jan 28, 2014
    • lstewart's avatar
      convert: use branchmap to change default branch in destination (issue3469) · 1d155582
      lstewart authored
      The fix for issue2653 broke the ability to map the default branch of a source
      repository to a non-default named branch in the destination repository.  Leave
      the default behaviour as is, but allow the branch name "None" to be used to map
      to a non-default named branch in the destination repository.
      1d155582
  13. Jan 27, 2014
  14. Jan 30, 2014
    • Katsunori FUJIWARA's avatar
      doc: fix mistake about matching against directories in "pattern.txt" · 45f23b1f
      Katsunori FUJIWARA authored
      This fixes mistake of documentation about matching against directories
      in "pattern.txt" introduced by 50db996bccaf.
      
      ".hgignore" treats specified "glob:" pattern as same as one specified
      for "-X" option: it can match against directories, too.
      
      For reference, extra regexp string appended to specified pattern for
      each types are listed below: see also "match.match()" and
      "match._regex()" for detail.
      
        ============= ========== ===============
        type          cmdline    -I/-X
        ============= ========== ===============
        glob/relglob  '$'        '(?:/|$)'
        path/relpath  '(?:/|$)'  '(?:/|$)'
        re/relre      (none)     (none)
        ============= ========== ===============
      
      Appending '$' means that the specified pattern should match against
      only files.
      45f23b1f
  15. Jan 29, 2014
    • Katsunori FUJIWARA's avatar
      dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True" · 03d345da
      Katsunori FUJIWARA authored
      Before this patch, shell alias may be executed by abbreviated command
      name unexpectedly, even if abbreviated command name matches also
      against the command provided by extension.
      
      For example, "rebate" shell alias is executed by "hg reba", even if
      rebase extension (= "rebase" command) is enabled. In this case, "hg
      reba" should be aborted because of command name ambiguity.
      
      This patch makes "_checkshellalias()" invoke "cmdutil.findcmd()"
      always with "strict=True" (default value).
      
      If abbreviated command name matches against only one shell alias even
      after loading extensions, such shell alias will be executed via
      "_parse()".
      
      This patch doesn't remove "_checkshellalias()" invocation itself,
      because it may prevent shell alias from loading extensions uselessly.
      03d345da
  16. Jan 30, 2014
  17. Jan 29, 2014
  18. Jan 22, 2014
    • Simon Heimberg's avatar
      i18n: fix non-matching 1st line indentations · f493c2f6
      Simon Heimberg authored
      When generating documentation, indentation must match for getting the same
      view for translated messages. Often an output is generated anyway, but it
      can look different. When a syntactically wrong indentation change is done,
      runrst will fail (this is detected by test-gendoc.t).
      
      Fix the simple places. When translation knowledge is necessary, the entry is
      marked as fuzzy (and therefore skipped when generating translations). A
      translator can fix it later.
      f493c2f6
    • Simon Heimberg's avatar
      i18n: fix some non matching quotation marks in translations · b7accec1
      Simon Heimberg authored
      A test for this is in preparation.
      b7accec1
    • Simon Heimberg's avatar
      i18n: do not translate rst syntax .. note:: · 4d60a7fe
      Simon Heimberg authored
      .. note:: is rst syntax which must not be translated. Fix this in the
      translations.
      
      This is not the first time this happens, so there should be a note for the
      translator. A later patch will change the generation of the po files to
      write this automatically.
      A test in i18n/check-translation.py could help as well.
      4d60a7fe
  19. Jan 27, 2014
  20. Nov 24, 2013
    • Angel Ezquerra's avatar
      subrepo: make it possible to update to hidden subrepo revisions · 427d672c
      Angel Ezquerra authored
      When a subrepo revision was hidden it was considered missing and mercurial was
      unable to update to the corresponding parent revision. Instead warn the user of
      the problem and let it choose what to do (the default is to udpate anyway).
      427d672c
    • Angel Ezquerra's avatar
      subrepo: remove unnecessary else clause in hgsubrepo._get · c5aef7a6
      Angel Ezquerra authored
      This revision has no behaviour change. It simply removes an unnecessary else
      that follows an if / return block. The change looks big because a big chunk of
      code has been unindented one level.
      c5aef7a6
    • Angel Ezquerra's avatar
      subrepo: do not try to get hidden revisions · d6939f29
      Angel Ezquerra authored
      If a subrepo revision is hidden (because it was amended, for example) it does
      not make sense to try to "get" it from the remote subrepository.
      
      Note that in order to avoid making the change look bigger than it is, this adds
      an unnecessary else clause. This will be removed on a follow up patch.
      d6939f29
  21. Jan 23, 2014
  22. Jan 28, 2013
  23. Jan 23, 2014
  24. Jan 21, 2014
Loading