1. mirror
  2. mercurial

Commits

Show all
Author Commit Message Date Builds
Matt Mackall
Makefile: be more careful when cleaning up pure/ components The recent introduction of pure/__init__.py causes mercurial/__init__.py to get clobbered by make clean.
Tags
2.2-rc
Branches
stable
Matt Mackall
merge default into stable for 2.2 code freeze
Branches
stable
idank
commit: add option to amend the working dir parent The --amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent in addition to those currently reported by "hg status", if there are any. The old commit is stored in a backup bundle in ".hg/strip-backup"(see "hg help bundle" and "hg help unbundle" on how to restore it). Message, user and date are taken from the amended commit unl…
Steven Stallion
transplant: remove extraneous whitespace
Matt Mackall
journal: use tryread helper to backup files (issue3375)
Matt Mackall
opener: introduce tryread helper This makes it easier to follow the common pattern "read a file or give an empty string if it's missing".
Angel Ezquerra
tests: add test for fileset 'subrepo' keyword
Patrick Mézard
revset: make matching() work on python 2.4 tuple.index() was apparently added to python 2.6: http://bugs.python.org/issue1696444 Also remove a trailing comma to make check-code.py happy.
Thomas Arendsen Hein
revset: use list instead of tuple for compatibility with python before 2.6 'string elements'.split() instead of explicitly typing a list of strings is used. This is done in other parts of Mercurial code, too.
Matt Mackall
merge with stable
Patrick Mézard
archive: make it work with svn subrepos (issue3308) - _svncommand() in files() returns a tuple since 0ae98cd2a83f not a string. - _svncommand() in filedata() returns a tuple not a string. - "svn list" returns files but also directories. - "svn list" is not recursive by default. I have no idea what happens to svn:externals possibly embedded in the svn subrepository.
Branches
stable
Martin Geisler
largefiles: hide .hglf/ prefix for largefiles in hgweb This makes the manifest view in hgweb match what you see in the working copy and what you get when you download an archive in hgweb.
Martin Geisler
hgweb: add hook for remapping repository path into virtual paths Extensions such as largefiles can use this to remap files so they appear in the same location as they do in the user's working copy.
Angel Ezquerra
tests: add tests for matching keyword This adds a couple of tests for the revset "matching" keyword: 1. Test that the 2nd parameter is optional 2. Test that all the 1st argument can be a revset and that all the supported fields of the 2nd argument work.
Angel Ezquerra
revset: speedup matching() by first matching fields that take less time to match This patch sorts the fields that are passed to the matching function so that it always starts by matching those fields that take less time to match. Not all fields take the same amount of time to match. I've done several measurements running the following command: hg --time log -r "matching(1, field)" on the mercurial repository, and where 'field' was each one of the fields accepted by match. I…
Angel Ezquerra
revset: speedup matching() by stopping the match early if a field does not match Rather than getting all the fields that are being matches from every revision and then comparing them to those of the target revision, compare each field one by one and stop the match as soon as there is a match failure. This can greatly reduce the match time when matching multiple fields. The impact on match time when matching a single field seems negligible (according to my measurements).
Angel Ezquerra
revset: make matching keyword not match summary when matching for description
Angel Ezquerra
fileset: add "subrepo" fileset symbol This new fileset symbol returns a list of subrepos whose paths match a given pattern. If the argument has no pattern type set, an exact match is performed. If no argument is passed, return a list of all subrepos.
Steven Stallion
plan9: finalize documentation for next release
Alain Leufroy
localrepo: do not complain about missing journal files
Alain Leufroy
repair: fix missing import introduced by: b5c0c7d0f83fe56240ce7a919581f1cbff4f5ee5
Na'Tosha Bard
largefiles: fix cat for largefiles (issue3352) This is a fix to largefiles so that 'hg cat' will work correctly when a largefile is specified. As per discussion on Issue 3352: 1) The file will be printed regardless if it is binary or large. 2) The file is downloaded if it is not readily available (not found in the system cache), so that it can be printed. If the download fails, then we abort.
Steven Stallion
pure: quiesce build warnings The following patch fixes the following warning when building pure: package init file 'mercurial/pure/__init__.py' not found (or not a regular file)
Matt Mackall
util.h: replace ntohl/htonl with get/putbe32
Wolfgang Treutterer
scmutil: fix systemrcpath regression introduced in f5dd179bfa4a Changeset f5dd179bfa4a introduced a 'root' path component to look for hgrc files, which is used both as an absolute path and a path relative to the <install-root>. The latter one was broken since 'root' was set to an absolute location and the subsequent os.path.join discarded the <install-root> path prefix.
Patrick Mézard
revlog: fix partial revision() docstring (from d7d64b89a65c)
Patrick Mézard
graphlog: fix --follow FILE and relative paths The situation is complicated because filelog() revset uses a match object in relpath mode while follow() revset interprets the filename as a manifest entry.
Patrick Mézard
graphlog: reduce duplication in --follow code
Patrick Mézard
graphlog: add all log options to glog command glog and log -G should be equivalent.
Patrick Mézard
graphlog: implement --hidden
  1. Prev
  2. Next