Skip to content
Snippets Groups Projects
  1. Mar 01, 2014
  2. Feb 26, 2014
    • Pierre-Yves David's avatar
      resolve: use "other" changeset from merge state (issue4163) · ba619c50a355
      Pierre-Yves David authored
      We can use the "other" data from the recorded merge state instead of inferring
      what the other could be from working copy parent. This will allow resolve to
      fulfil its duty even when the second parent have been dropped.
      
      Most direct benefit is fixing a regression in backout.
      ba619c50a355
    • Pierre-Yves David's avatar
      merge: add "other" file node in the merge state file · 3678707e4017
      Pierre-Yves David authored
      This data is mostly redundant with the "other" changeset node (+ other changeset
      file path). However, more data never hurt.
      
      The old format do not store it so this require some dancing to add and remove it
      on demand.
      3678707e4017
  3. Feb 27, 2014
    • Pierre-Yves David's avatar
      merge: infer the "other" changeset when falling back to v1 format · 303cbfe3dcc8
      Pierre-Yves David authored
      When we have to fallback to the old version of the file, we infer the
      "other" from current working directory parent. The same way it is currently done
      in the resolve command. This is know to have shortcoming… but we cannot do
      better from the data contained in the old file format. This is actually the
      motivation to add this new file format.
      303cbfe3dcc8
  4. Feb 26, 2014
    • Pierre-Yves David's avatar
      merge: record the "other" node in merge state · 02c60e380fd0
      Pierre-Yves David authored
      We need to record the merge we were merging with. This solve multiple
      bug with resolve when dropping the second parent after a merge. This
      happen a lot when doing special merge (overriding the ancestor).
      Backout, shelve, rebase, etc. can takes advantage of it.
      
      This changeset just add the information in the merge state. We'll use it in the
      resolve process in a later changeset.
      02c60e380fd0
    • Pierre-Yves David's avatar
      merge: introduce new format for the state file · 2b7d54e929b4
      Pierre-Yves David authored
      This new format will allow us to address common bugs while doing special merge
      (graft, backout, rebase…) and record user choice during conflict resolution.
      
      The format is open so we can add more record for future usage.
      
      This file still store hexified version of node to help human willing to debug
      it by hand. The overhead or oversize are not expected be an issue.
      
      The old format is still used. It will be written to disk along side the newer
      format. And at parse time we detect if the data from old version of the
      mergestate are different from the one in the new version file. If its the same,
      both have most likely be written at the same time and you can trust the extra
      data from the new file. If it differs, the old file have been written by an
      older version of mercurial that did not knew about the new file. In that case we
      use the content of the old file.
      2b7d54e929b4
  5. Feb 27, 2014
  6. Feb 26, 2014
  7. Feb 27, 2014
  8. Feb 25, 2014
    • Piotr Klecha's avatar
      pull: close peer repo on completion (issue2491) (issue2797) · 7f865a94691e
      Piotr Klecha authored
      When pulling changes from a compressed bundle Mercurial first uncompresses it
      to a temporary file in .hg directory. This file will not be deleted unless
      the bundlerepo (other) is explicitly closed.
      
      This is similar to cleanup that occurs after incoming.
      7f865a94691e
  9. Feb 26, 2014
    • Paul Boddie's avatar
      hgweb: ensure isdirectory is None for repositories, replacing any True value · 3d77e567de56
      Paul Boddie authored
      Until now, repositories did not provide any value for isdirectory in rows
      produced for the index output, and thus isdirectory was generally evaluated as
      None for each index entry representing a repository.
      
      However, directories (visible when viewed with the descend and collapse
      settings enabled) did provide a value of True and this value appeared to
      persist in subsequent rows processed by the templater, causing isdirectory
      tests in templates to produce incorrect results for index entries appearing
      after directories.
      
      This patch asserts the None value for repositories, thus erasing any such
      persistent True values.
      3d77e567de56
  10. Feb 25, 2014
  11. Feb 23, 2014
  12. Feb 16, 2014
  13. Feb 19, 2014
  14. Feb 15, 2014
  15. Feb 13, 2014
  16. Feb 10, 2014
    • Brodie Rao's avatar
      hooks: only disable/re-enable demandimport when it's already enabled · aac87f70f38e
      Brodie Rao authored
      This fixes an issue introduced in d7c28954d901 where, when disabling
      demandimport while running hooks, it's inadvertently re-enabled even when
      it was never enabled in the first place.
      
      This doesn't affect normal command line usage of Mercurial; it only matters
      when Mercurial is run with demandimport intentionally disabled.
      aac87f70f38e
  17. Feb 09, 2014
    • Mads Kiilerich's avatar
      merge: don't overwrite file untracked after remove, abort with 'untracked files' · e4d7cbc94219
      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.
      e4d7cbc94219
  18. Feb 05, 2014
  19. Feb 03, 2014
  20. Feb 01, 2014
  21. Jan 31, 2014
  22. Jan 30, 2014
  23. Jan 22, 2014
    • Simon Heimberg's avatar
      i18n-de: updated po file with 427d672c0e4e · a789213c8a38
      Simon Heimberg authored
      Do this in a separate patch for easier reviewing of the translation patch.
      a789213c8a38
    • Simon Heimberg's avatar
      i18n-de: remove locations · 8f63b2880f1f
      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
      8f63b2880f1f
  24. Jan 31, 2014
  25. Jan 29, 2014
  26. Jan 30, 2014
    • Pierre-Yves David's avatar
      clone: do not turn hidden changeset public on publishing clone (issue3935) · a959f7167077
      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.
      a959f7167077
  27. Jan 28, 2014
    • lstewart's avatar
      convert: use branchmap to change default branch in destination (issue3469) · 1d155582a8ea
      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.
      1d155582a8ea
Loading