Skip to content
Snippets Groups Projects
  1. Mar 20, 2013
  2. Mar 19, 2013
  3. Mar 17, 2013
  4. Mar 18, 2013
  5. Mar 15, 2013
    • Durham Goode's avatar
      rebase: fix --collapse when a file was added then removed · 1ef89df2
      Durham Goode authored
      When a series of commits first adds a file and then removes it,
      hg rebase --collapse prompts whether to keep the file or delete it. This is
      due to it reusing the branch merge code. In a noninteractive terminal it
      defaults to keeping the file, which results in a collapsed commit that is
      has a file that should be deleted. This bug resulted in developers accidentally
      commiting unintentional changes to our repo twice today, so it's fairly
      important to get fixed.
      
      This change allows rebase --collapse to tell the merge code to accept the
      latest version every time without prompting.
      
      Adds a test as well.
      1ef89df2
  6. Mar 18, 2013
  7. Mar 11, 2013
  8. Mar 17, 2013
  9. Mar 16, 2013
    • Kevin Bullock's avatar
      bookmarks: allow moving a bookmark forward to a descendant · 56dd55da
      Kevin Bullock authored
      Allow 'hg bookmark MARK', with an existing bookmark MARK, to move the
      bookmark forward to the current or specified revision, if the target
      revision is a descendant of the revision the bookmark currently points
      to. Prints a status message including the revision the bookmark was
      formerly at:
      
        $ hg bookmark Z
        moving bookmark 'Z' forward from 663762316562
      
      Test coverage is added.
      56dd55da
  10. Feb 26, 2013
    • Angel Ezquerra's avatar
      hgweb: change manifest archive links to only archive the current directory · 0bba1ff2
      Angel Ezquerra authored
      When the web server shows the manifest for a single, non top directory, append
      the path to the directory to the archive links. This makes the web server
      generate archive files that only include the current directory (and its
      subdirectories).
      
      Note that archive links in other pages (e.g. changeset) or at the top of the
      manifest are unchanged. Directory archive links have an extra "/" at the end
      which does not impact the result of the archive operation. Keeping it there
      made the implementation of this feature simpler.
      0bba1ff2
  11. Feb 10, 2013
    • Angel Ezquerra's avatar
      hgweb: teach archive how to download a specific directory or file · bb38f4f7
      Angel Ezquerra authored
      The archive web command now takes into account the "file" request entry, if one
      is provided.
      
      The provided "file" is processed as a "path" corresponding to a directory or
      file that will be downloaded.
      
      With this change hgweb can to process requests such as:
      
          http://mercurial.selenic.com/hg/archive/tip.zip/mercurial/templates
      
      This will download all files on the mercurial/templates directory as a zip file.
      It is not possible to specify file patterns ('glob', 'relglob', 'path',
      'relpath', 're', 'relre' nor 'set'). The server will reject those with a
      403 HTTP error response.
      
      Note that this is a first step to add support for downloading directories from
      the web interface. A following patch will modify the archiveentry map entry on
      the different templates so that it adds the current folder path to the archive
      links.
      bb38f4f7
  12. Feb 06, 2013
  13. Mar 14, 2013
  14. Mar 13, 2013
    • Durham Goode's avatar
      blackbox: add backup bundle paths to blackbox logs · 64b55625
      Durham Goode authored
      Writes the backup bundle paths to the blackbox so it's easy to see which
      backup bundle is associated with which command when you are debugging an
      issue.
      
      Example output:
      
      2013/03/13 10:39:56 durham> strip tip
      2013/03/13 10:39:59 durham> saved backup bundle to /data/users/durham/www-hg/.hg/strip-backup/e5fac262363a-backup.hg
      2013/03/13 10:40:03 durham> strip tip exited 0 after 7.97 seconds
      64b55625
  15. Mar 12, 2013
  16. Mar 09, 2013
  17. Mar 10, 2013
  18. Mar 07, 2013
    • Durham Goode's avatar
      strip: make --keep option not set all dirstate times to 0 · e74704c3
      Durham Goode authored
      hg strip -k was using dirstate.rebuild() which reset all the dirstate
      entries timestamps to 0.  This meant that the next time hg status was
      run every file was considered to be 'unsure', which caused it to do
      expensive read operations on every filelog. On a repo with >150,000
      files it took 70 seconds when everything was in memory.  From a cold
      cache it took several minutes.
      
      The fix is to only reset files that have changed between the working
      context and the destination context.
      
      For reference, --keep means the working directory is left alone during
      the strip. We have users wanting to use this operation to store their
      work-in-progress as a commit on a branch while they go work on another
      branch, then come back later and be able to uncommit that work and
      continue working.  They currently use 'git reset HARD^' to accomplish
      this in git.
      e74704c3
  19. Mar 09, 2013
    • Durham Goode's avatar
      sshpeer: store subprocess so it cleans up correctly · 9baf4330
      Durham Goode authored
      When running 'hg pull --rebase', I was seeing this exception 100% of the
      time as the python process was closing down:
      
      Exception TypeError: TypeError("'NoneType' object is not callable",) in
      <bound method Popen.__del__ of <subprocess.Popen object at 0x937c10>> ignored
      
      By storing the subprocess on the sshpeer, the subprocess seems to clean up
      correctly, and I no longer see the exception. I have no idea why this actually
      works, but I get a 0% repro if I store the subprocess in self.subprocess,
      and a 100% repro if I store None in self.subprocess.
      
      Possibly related to issue 2240.
      9baf4330
  20. Feb 28, 2013
  21. Mar 19, 2013
  22. Mar 11, 2013
    • Durham Goode's avatar
      rebase: restore active bookmark after rebase --continue · 72412afe
      Durham Goode authored
      When a rebase has conflicts and the user uses rebase --continue, the previously
      active bookmark was not being made active once again. With this change that
      bookmark is made active again, just as if the rebase had never been interrupted.
      
      This changes the rebasestate file format, but should handle old formats correctly.
      Since the file is transient, this is even less of a problem.
      
      Adds a test to verify the new behavior. I manually tested continuing rebases
      with and without an active bookmark, and with and without being on the bookmark
      being rebased.
      72412afe
  23. Mar 04, 2013
  24. Feb 09, 2013
  25. Feb 10, 2013
  26. Feb 09, 2013
Loading