Skip to content
Snippets Groups Projects
  1. Sep 28, 2014
  2. Sep 30, 2014
  3. Oct 02, 2014
  4. Sep 26, 2014
    • Pierre-Yves David's avatar
      bookmark: make the search for divergent names more robust · 808df84fba83
      Pierre-Yves David authored
      We translate the "url we update from" and "the url in the config" into their
      canonical representation. This is useful for urls that have multiple equivalent
      forms:
      
        /foo/bar/ == file:/foo/bar/ == file:///foo/bar
      
      
      eg: hg pull --config path.bar=/foo/bar/ file:/foo/bar
      808df84fba83
    • Pierre-Yves David's avatar
      pull: gather all bookmark-pulling code together · fb74a5833467
      Pierre-Yves David authored
      Pulling bookmarks is done in two rounds. First we do a simple update, then we use
      the content of the `bookmark` argument to possibly overwrite some bookmark
      with their remote location.
      
      The second step was not done right after the first one for some obscure reason.
      We now perform them one after the other.
      fb74a5833467
  5. Sep 25, 2014
  6. Sep 16, 2014
  7. Sep 12, 2014
  8. Aug 31, 2014
    • Pierre-Yves David's avatar
      revert: properly back up added files with local modification · 2ff28e07d7d6
      Pierre-Yves David authored
      These files were previously not backed up because the backup mechanism was not
      smart enough. This leads to data lose for the user since uncommitted contents
      were discarded.
      
      We now properly move the modified version to <filename>.orig before deleting it.
      
      We have to use a small hack to do a different action if "--no-backup" is
      specified. This is needed because the backup process is actually a move (not a
      copy) so the file is already missing when we backup. The internet kitten is a
      bit disapointed about that, but such is life.
      
      This patch concludes the "lets refactor revert" phases. We can now open the
      "Lets find stupid bug with renames and merge" phases.
      
      I'm sure that now that the code is clearer we could do it in another simpler
      way, but I consider the current improvement good enough for now.
      2ff28e07d7d6
  9. Aug 30, 2014
    • Pierre-Yves David's avatar
      revert: track added files with local modifications · 0f323ed8effd
      Pierre-Yves David authored
      Those files need to be backed up but are currently not. We compute the set of
      them to be able to use a different backup strategy in the next changeset.
      0f323ed8effd
    • Pierre-Yves David's avatar
      revert: distinguish between "check" and "backup" strategy · 3760ebf786b8
      Pierre-Yves David authored
      "check" behaves as backup did before. We check if the current file differs
      from destination and we create a backup if it does. This is used for untracked
      files that will be overwritten by formerly-deleted files. We have to do the manual
      check since no status output can provide the content comparison.
      
      "backup" is now doing unconditional backup. This can be used for files seen as
      modified compared to both the target and the working directory. In such a case, we
      know that the file differs from target without actually comparing any content.
      
      This new "backup" strategy will be especially useful in the case of files added
      between the target and the working directory -parent- with additional modifications
      in the working directory -itself-. In that case we know we need to back it up, but we
      cannot run the content check as the files does not exists in target.
      3760ebf786b8
    • Pierre-Yves David's avatar
      revert: small refactoring in the way backup value are handled · bf0ecb224316
      Pierre-Yves David authored
      The current backup value may have two different values:
      
        1. Do not try to do backup
        2. Do backup if applicable
      
      We are about to move to:
      
        1. Do not try to do backup
        2. Do backup if applicable
        3. Do backup in all cases
      
      So we change the current values to make room for the new one.
      bf0ecb224316
  10. Oct 01, 2014
  11. Sep 30, 2014
  12. Sep 22, 2014
  13. Sep 15, 2014
Loading