summaryrefslogtreecommitdiff
path: root/devel/mercurial
AgeCommit message (Collapse)AuthorFilesLines
2010-02-10Bump revision for PYTHON_VERSION_DEFAULT change.joerg1-1/+2
2010-02-03Update to 1.4.3:wiz2-7/+7
1.4.3 - 2010-02-01 This is a scheduled bugfix release. * Mercurial license has changed from GPLv2 to GPLv2+ * speed up copy detection in merge, status, and diff * templates: fix relative path expansion on style setting * merge: fix merging of already-merged subrepos * summary: fix i18n issue reporting clean working directories * hgweb: improve IIS PATH_INFO handling * relink: Windows support
2010-01-15Update to 1.4.2:wiz2-6/+6
1.4.2 - 2010-01-01 This is a minor bugfix release. core * config: raise ConfigError on non-existing include files * alias: do not crash when aliased command has no usage help text * auth: allow specifying auth sections in .hg/hgrc * patch: fix handling of chunk offsets * subrepo: add default path to new clones * docs: Fix rst2html detection extensions * convert/svn: better handling of hg recursive call failure * convert/svn: make sink recover gracefully from empty changeset * keyword: fix interaction with transplant * mq: preserve --git flag when folding and merging patches * mq: qnew -f rejects merge working directories * mq: qpop: remove added files before re-adding removed files * patchbomb: handle repository#rev URLs correctly * share: use defaultdest to compute unspecified destination
2009-12-02Update to 1.4.1:wiz3-7/+10
1.4.1 - 2009-12-01 regression fixes * fix to prepush logic when it creates new heads * fix qseries truncation other * doc fixes: formatting, missing options * tests fixes (now less dependent on environment variables) * inotify fixes * keyword: allow RCSfile like CVS * share: fix a bad interaction with clone * show non-default branch names with summary -q * new schemes extension * i18n updates
2009-11-17Update to 1.4:wiz3-7/+28
1.4 - 2009-11-16 core * summary: new command summarizes current working state * tags: new tag cache greatly speeds up tag operations * diff: new --stat option to show diffstat * diff: add --reverse option to diff * subrepo: fix a bunch of issues with the experimental subrepo extension * status: fixes for behavior when working with clock skew * clone: new -u/--updaterev option * templater: new latesttag and latesttagdistance keywords * push/pull: handle some broken pipe errors during large transfers * config: environment variables and ~user constructs are expanded in pathnames hgweb * fix for showing header lines in raw changeset diffs * try to send better error messages to the client * use config-supplied ordering by default in hgwebdir index pages * add web.descend option to disable showing all nested repositories in hgwebdir documentation and help * new config help topic * help texts are now written in reStructuredText format * many translation updates including a new Swedish translation * many help text updates and improvements extensions * mq: add -1 options to qapplied/qunapplied * patchbomb: add a --flag option to set a flag value in the Subject header * patchbomb: correctly handle Unicode domains (using the IDNA encoding scheme) * color: improve colorization of the qseries command * inotify: cleaner code, fixed pattern handling * zeroconf: show repository descriptions * rebase: some performance and correctness fixes * extdiff: add 3-way diff for merge changesets * convert: handle directory renaming in Darcs, fixed file renaming * relink: new extension which helps people re-hardlink their clones other * contrib/shrink-revlog.py script that can significantly shrink some internal hg files * work around non-standard locale settings on OS X
2009-09-07Retire Python 2.3 support.joerg1-2/+1
2009-07-23Update to 1.3.1:wiz2-6/+6
Regression fixes: - fixed excessive memory usage issues with diff and strip - fixed ssh performance issue on OS X - fixed slow calculation of branch heads - fixed handling of port numbers in URLs - fixed transaction handling exception - fixed incoming with graphlog extension - fixed slow commit in fetch extension - fixed loading of win32mbcs extension Other fixes: - fixed http username handling in acl extension - fixed subrepo path joining on Windows - allow update --check to cross branches - miscellaneous small doc and bug fixes
2009-07-17Update to 1.3. Set LICENSE. Disallow Python-2.3 (see below).wiz3-20/+55
Major Changes * experimental support for sub-repositories * Python 2.3 is no longer supported; now requires Python 2.4-2.6 Commands * merge: add -P/--preview option * update: don't unlink added files when -C/--clean is specified * update: added -c/--check option to abort on local changes * update: allow merges going backwards * push: improved handling of named branches * branches/heads: add a -c/--closed option to show closed branches * help: new extensions topic General * add patch.eol config setting to work with cross-platform patches * fixed support for SSL through proxies * add ability to load hooks from arbitrary Python modules * hide passwords for HTTP repositories in error and log output * fix Python 2.6 support in the Windows installer * add mechanism for specifying HTTP authentication details in hgrc * prompts and choices are now shown even in non-interactive mode * performance improvements, especially on Windows * much improved zsh completion * improved Danish, Japanese, Italian and simplified Chinese translations * new German, French, Greek, Brazilian Portuguese and traditional Chinese translations Web interface * read configuration data from webdir configs * add branches page to hgweb * pluggable templater engine support * refresh hgwebdir configuration periodically * let web.encoding override ui.encoding setting * deal with dicts/lists like webdir config paths Extensions * experimental share extension * the alias extension has been moved into core * mq o add -P/--push option to qimport o numerous bug fixes * convert o improved source detection o support for comments in author maps o add branch map support o add different ordering options o svn: support OS-specific authn providers o svn: improved tag support o git: add committer tag only when needed o bzr: fix renaming support o bzr: add support for filemaps o bzr: handle timestamps correctly o bzr: fix symlink handling o bzr: restore paths to source encoding o cvs: add support for CVS merge(point)s o cvs: add support for synthetic revisions o cvs: better support for branchpoints o cvs: deprecate use of external cvsps o mtn: improve renaming support o mtn: support mtn database files as source o mtn: improve date/time support o p4: better handling of keywords, binary files and symlinks * rebase o don't lose copy/rename info o keep original mq patch format * zeroconf o advertise repositories by hostname o try to guess IP address if necessary * patchbomb o option to set attachment name o support for In-Reply-To header * inotify o fix handling of untracked files moved out of repository o fix support for directory deletion * acl: now works with push over https
2009-07-16update master_sites and homepagezafer1-3/+3
2009-06-14Remove @dirrm entries from PLISTsjoerg1-28/+1
2009-03-22Update to 1.2.1:wiz3-27/+6
This is a bugfix release. * fixed version number build from tarball * fix allow_read logic for hgweb * improve handling of damaged revlogs in verify * keep .orig files when resolving * clear resolve state properly when rebasing * improve --command handling with bisect * fix diff against bundles * improve fetch logic for inactive branches * fix diffstat with notify * fix 'synthetic file adds' in CVS conversion
2009-03-12Needs msgfmt.hasso1-2/+2
2009-03-11make "hg --version" display the version, bump PKGREVISIONdrochner3-2/+23
2009-03-06Update to 1.2:wiz3-17/+33
General features: * explicit closing of named branches via hg commit --close-branch * hg now accepts options given after arguments on the commandline * added translation support with initial Danish, Chinese and Italian translations * added optional pure-Python versions of C modules * pending changesets can now be accessed safely from hooks * diff: added -c option to show single changeset * many improvements to the documentation and online help topics Extensions: * convert: * new support for perforce sources * improvements to handling cvs sources * improvements to handling gnu arch source * improvements to handling darcs sources * bookmarks: * set current to new when current is renamed * bookmarks: Add track.current option * bookmarks: add bookmarks to tags * mq: allow qpop when it won't invalidate any dirstate parents * patchbomb: respect diff settings * rebase: pull --rebase updates if there is nothing to rebase * bugzilla: updated to work with Bugzilla 3.2 * zeroconf: added more documentation
2009-02-09Switch to Python 2.5 as default. Bump revision of all packages that havejoerg1-1/+2
changed runtime dependencies now.
2009-01-07Update to 1.1.2:wiz2-6/+6
This is a minor release including one security fix and two minor bug fixes * improve path auditing (issue 1450) * fix date-related test failures in test suite * add graph controls to monoblue theme
2008-12-21Update to 1.1.1:wiz2-6/+6
This is a bugfix release * make hgweb recursion optional (use '**' rather than '*') * fix fncache bug for directories ending in ' ' or '.' * require -a switch to resolve all files * improve help for resolve command * fix inotify interaction with bundle diffs * fix strange readline import error on Windows * fix non-existing target directory with git diffs * fix removing symlinks with git diffs * fix directory creation bug in patch * rebase: allow keeping branch names * fix a copy bug in the SVN converter
2008-12-02Update to 1.1:wiz3-33/+124
Version 1.1 - 2008-12-2 This is a larger feature release. General: * Added 'resolve' command for better tracking of in-progress merges * Several speedups for status and diff commands (especially on Windows) * Some modules have been rewritten in C for greater speed * Compatibility with Python 2.6 * Improved correctness in the face of casefolding filesystems * Fixed a possible race condition in pull * Fix support for context-size diff settings * Fixed several crashes on Windows related to code freezing * Don't complain when trying to load extensions twice * Allow C extensions to compile on Haiku * Allow for committing in-memory file contents * New repository format which limits path lengths in the store * Unclutter commands list by extracting extension commands into separate lists * static-http support is now a fallback for the general http support * Add some buffering to the templater * Better documentation on git diffs Web interface: * Add a canvas-based repository graph * New and improved hgweb themes: paper, coal and monoblue * paper is now the new default style; the old default is now called 'spartan' * Better WSGI compliance * Collections now show nested repos (best used without a checkout) * diffs are more sensible, follow diff.git settings * Full author name available in annotate templates * Make it easier to add template paths in extensions * Support for allow_read/deny_read access controls * Working diff and file log for removed files * Better alternative for repository collections * Corrected feed link in gitweb theme * Fix a bug with CGIs running under IIS Commands: * commit: print the revision ID when invoked with --verbose * resolve: new command to help keep track of merges * merge: only implicitly select same-branch heads * export: append instead of overwrite when exporting multiple changesets * bundle: added support for different compression types * rollback: clean up empty files * help: several more sections from the manual are available through hg help now * bisect: better documentation, give better feedback, option for scripted testing * branch: allow for resetting current branch name * patch: add a --similarity option to do rename/copy detection * tag: without a checkout, use tip as the tagging revision's parent * log: allow searching by user (with -u) * import: importing from URL now works with http authentication * unbundle: importing from URL now works * pull: with -u, still update if there's only one head on the current branch * diff: fix a problem with the --showfunc option Extensions: * rebase: new extension to support rebasing changesets * bookmarks: new extension to provide (local-only) git-like branches * zeroconf: new extension to support publishing repositories through Zeroconf/Bonjour * hgcia: new extension to facilitate communication with CIA * mq: o qfinish: added command for conversion of patches into changesets o qpush/qgoto: gracefully abort when encountering guards o qrefresh: don't lose work when interrupted o qimport: allow for importing patches from URLs o qnew: abort early if patch already exists, be more careful in general o qdiff: now supports all diff options o qfold: more tolerance of file removals, better handling of commit messages o import: prevent import from working when patches are applied * convert: o added support for conversion from bzr repositories o incorporate an improved Python version of cvsps, replacing the external cvsps tool (see upgrade notes) o compatibility with recent git releases o add an option to start from an arbitrary revision o correctly encode characters in Subversion repository URLs o better, more tolerant tags detection * highlight: o remove need to pre-generate CSS stylesheet o compatibility with older Pygments versions o make the lexer guessing faster by not reading all of the file o allow demandimport to load it incrementally * fetch: improve support for named branches * graphlog: o now adds --graph options to log, incoming and outgoing o fix calls from outside the repository * inotify: o many bugfixes, should work much better o daemon is automatically started by default * color: o add colorization of diffs o add --color options to many commands * keywords: be more careful about expanding binary files * bugzilla: added support for Bugzilla 3.0 * pager: allow per-command configuration * hgk: display branch names for revisions * churn: support for templated statistics report generation * patchbomb: charset encoding can now be configured * notify: charset encoding can now be configured
2008-08-31cosmetics: remove unneeded patch (no change to installed pkg)drochner3-18/+2
2008-08-29Update to mercurial-1.0.2bjs4-36/+16
This is a relatively small bugfix release with two security fixes. Security: * ensure that git patches only touch files within the repository (CVE-2008-2942) * hgweb: fix "allowpull" permission being ignored when pulling from hgweb General: * commit: handle copies of previously deleted files (issue 1175) * bisect: allow for having multiple resulting changesets * fix Python 2.3 compatibility * make mq patches and .hgtags hardlink-safe again * various documentation improvements and fixes * fix a crash when addremove was called to replace a deleted directory with a symlink * make branches output easier to parse (issue 1230) * fix inactive branches detection (issue 1104) * hgweb: fix a crash in archive when the URL did not end in an expected archive type * sshserver: fix a crash in error handling code * fix the patchbomb extension on Windows by including email package in binary installations * handle symlinks when OS supports them but FS doesn't (issue 1149) Extensions: * mq: * fix qrefresh losing metadata on the last refreshed file (issue 1134) * fix a crash when renaming a patch just after a versioned queue initialization * fix the path of an explicitly specified queue when merging patches * strip now updates the working directory only if a parent was stripped * convert: * CVS: fix a crash when converting an existing working copy * monotone: fix quotes and backslashes parsing when reading commit messages * Subversion: correctly normalize paths and slashes * Subversion: fix compatibility with Subversion 1.5 * git: allow converter to work with recent git releases * color: * get coloring for qseries --verbose output * improve mq extension detection * reset coloring before and after outputting colorized lines * highlight: fix a performance issue when detecting file types from large files * notify: take the diff options into account
2008-07-19add patch from upstream CVS to fix path checking on git style patchdrochner3-2/+22
import (CVE-2008-2942), bump PKGREVISION
2008-05-30Update to 1.0.1: Bugfix release.wiz3-10/+10
2008-04-25Update PYTHON_VERSIONS_COMPATIBLEjoerg1-3/+1
- assume that Python 2.4 and 2.5 are compatible and allow checking for fallout. - remove PYTHON_VERSIONS_COMPATIBLE that are obsoleted by the 2.3+ default. Modify the others to deal with the removals.
2008-04-10Update to mercurial 1.0 and add DESTDIR support. Changes:bjs4-48/+68
General: * greatly improved merge tool configuration, see "hgrc.5.txt" for details * improved copy/rename handling in diffs, status, and merge * files in .hg inherit permissions from .hg/store * infer --repository when possible, so commands may be run from anywhere. * easy-installable * new "droplet" logo Commands: * archive: disable ".hg_archival.txt" file addition with "ui.archivemeta" * bisect: now built-in with greatly improved performance and usability * bundle: new --all option to bundle the whole repository more easily. * cat: apply decode filters with --decode * clone: can clone from a full-history bundle * commit: warn when creating a new head * debugancestor: index argument is now optional * diff: set the number of context line to show with -U/--unified * grep: display matched revisions commit date with --date * import: new --no-commit and --user options * incoming/outgoing: add --limit option * log: use -b/--only-branch to show revisions of a single branch * remove: improve handling for --after * revert: major speedup * serve: prefix the served path with --prefix (also in [web] section) * status: unknown files are skipped by --quiet * tag: allow multiple tags to be added or removed * tags: --verbose flags local tags * update: switch between named branches without -C Extensions: * churn: promoted to an official extension (previously in contrib) * color: new extension coloring "status" and "qseries" command outputs * convert: * hgk: configuration file changed from .gitk to .hgk * highlight: new extension enabling syntax highlighting in hgweb file view (requires pygments) * inotify: new extension using Linux 2.6 inotify API for instant status checking * keyword: new extension for filewise RCS-keyword expansion in working directory * mq: new --currentdate, --date, --currentuser, and --user options * record: add "qrecord" command when used with mq Web interface: * improved WSGI integration and compatibility * follow symlinks in hgwebdir collections * show branches in most of gitweb templates * add line anchors to annotate, changeset, diff and file views * support web.baseurl in hgwebdir, overriding SCRIPT_NAME Hooks: * standard hook to reject text files with CRLF in win32text extension * redirect stdout to stderr for ssh and http servers
2007-10-26Update to 0.9.5:wiz3-7/+54
New features: * Handle symlinks on systems without symlink support * hg archive supports symlinks * Display executable/symlink bit with "hg manifest -v" (see UpgradeNotes) * Improved hg verify diagostics * Faster revlog handling * Faster handling of large directories * Greatly improved handling of large files * Atom syndication support in hgweb * Improved test suite with parallel execution Fixes: * Fixes for some file copy and rename corner cases * Allow moving newly-added files before commit * Improve hg diff whitespace handling * Disallow fast-forward merge with an ancestor * Fix adding untracked files on directory renames * Fix hg archive %r format specifier * Fix re: and glob: patterns in .hgignore * Improve hg executable path resolution * Many options and hgrc parsing improvements * Better handling of VFAT filesystems on Linux * Fix tgz archival on Windows * Fix hg serve on Windows requiring pywin32 modules * Fix --profile under Windows New extensions: * alias - allow user-defined command aliases * children - show the children of the given or working dir revision * imerge - incremental interactive merging * interhg - modify changelog text as in InterWiki * record - darcs-style interactive change selection during commit New extension features: * convert * Now supports Subversion, Darcs and Mercurial as source SCMs * Use clone's behaviour for the default destination name * Force encoding to UTF-8 for converted repository * Support new-style .cvspass file format * Filter the files and directories to import * Remap paths to new locations during import * hgk * Fix hgk stopping because of untrusted repository warnings * Handle filenames with spaces * Improved documentation * mq * Autodetect --git patches on qrefresh
2007-07-03Update to 0.9.4:wiz3-17/+47
New features: * support for symlinks * improved tag handling * improved merge handling of file and directory renames * improved named branch usability * numerous improvements to commands * generic pre- and post-command hooks * improved Windows support * basic BeOS and OpenVMS support * numerous bug fixes New extensions and contributions: * extensions can now be specified in .hg/hgrc * new convert extension with CVS support * new graphlog extension * improved patchbomb extension * example FastCGI script
2007-02-17Add "scm" to CATEGORIES to make it easy to find source control managementwiz1-2/+2
related packages.
2007-01-02Update mercurial to 0.9.3.minskim4-11/+14
Bug fixes: * fix a merge copy/rename corner case * fix spurious new heads message with push -r * fix hg export %n sequence numbers * fix shell quoting on Windows * fix charset encoding for hgwebdir and obfuscated addresses * fix missing generated files for distribution tarball * fix convert-repo tag updates and transcoding of committer * add instructions for redoing failed merges Documentation fixes: * hg cat, manifest, and tag default to current parent revision. * CGI stub comments clarified * corrected synopses for many commands * improve doc building and distribution * convert-repo: update usage information Extension fixes: * mq: fix strip on Windows * mq: fix some guards corner cases * gpg: make 'hg sign' default to current parent
2006-12-11Update to 0.9.2:wiz4-40/+120
New features: - merge now follows renames and copies - new layout protects against case-insensitivity issues - new branch and branches commands for managing named branches - push command accepts -r for pushing specified heads or named branches - proper storage of changelog and other metadata in UTF-8 - log, annotate and grep '--follow' follow renames and copies - date parsing is improved and log, update, and revert accept --date ranges - additional command options for log, status, addremove - improved schema for hgweb URLs - bundle can now use '-r' and '--base' removing the need of an base repository - support for git-style extended patches with --git option - new debuginstall command to check for common installation issues New contributions and extensions: - mq - support for quilt-style guards - can import existing changesets into mq ('qimport -r') or commit mq patches as regular changesets ('qdel -f') - edit the log message with 'qrefresh -e' - rename patches with 'qrename' - qheader to display the patch header of particular patches, and '--summary' for qseries, qapplied, qunapplied and qtop - combine patches with 'qfold' - qrefresh supports pattern options to import only a subset of the changes into a patch, to help split changes into multiple patches - patch names for applied patches act like local tags, and can be used in the revision arguments of any hg command - hgk - browse a subset of the history with '--limit' and revision range arguments - shows revision numbers as well as node hashes - churn: graph lines of code changed per user over a range of history - patchbomb: generate inline attachments with '-a' Behavior changes: - hg cat defaults to the working directory revision rather than tip - hg manifest no longer shows internal file revision hashes by default - hg revert now requires the -a flag to revert all files Developer notes: - new high-level API functions in the 'hg' module - new context API simplifies many operations - The changelog can now include arbitrary metadata in key: value form
2006-07-25Update mercurial to 0.9.1.minskim3-10/+53
New features: - You can now configure your 'hgweb' server to let remote users 'push' changes over http. - You can now 'import' a patch in a mail message by saving the mail message, and importing it. This works for patches sent either inline or as attachments. - The 'diff' command now accepts '-rA:B' syntax as a synonym for '-r A -r B', and adds '-b' and '-B' options. For a complete list of major changes, see the announcement at http://www.selenic.com/pipermail/mercurial/2006-July/009510.html
2006-05-30Update to 0.9:wiz3-14/+26
Major changes between Mercurial 0.8.1 and 0.9: - The repository file format has been improved. - This has resulted in an average 40% reduction in disk space usage. - The new format (called RevlogNG) is now the default. - Mercurial works perfectly with both the old and new repository file formats. It can transfer changes transparently between repositories of either format. - To use the new repository format, simply use `hg clone --pull` to clone an existing repository. - Note: Versions 0.8.1 and earlier of Mercurial cannot read RevlogNG repositories directly, but they can `clone`, `pull` from, and `push` to servers that are serving RevlogNG repositories. - Memory usage has been improved by over 50% for many common operations. - Substantial performance improvements on large repositories. - New commands: - 'archive' - generate a directory tree snapshot, tarball, or zip file of a revision - Deprecated commands: - 'addremove' - replaced by 'add' and 'remove --after' - 'forget' - replaced by 'revert' - 'undo' - replaced by 'rollback' - New extensions: - Bugzilla integration hook - Email notification hook - Nested repositories are now supported. Mercurial will not recurse into a subdirectory that contains a '.hg' directory. It is treated as a separate repository. - The standalone web server, 'hg serve', is now threaded, so it can talk to multiple clients at a time. - The web server can now display a "message of the day". - Support added for hooks written in Python. - Many improvements and clarifications to built-in help. Sort PLIST.
2006-04-08Update mercurial to 0.8.1.minskim4-53/+38
Changes: - new extensions: mq (manage a queue of patches, like quilt only better) email (send changes as series of email patches) - new command: merge (replaces "update -m") - improved commands: log (--limit option added), pull/push ("-r" works on specific revisions), revert (rewritten, much better) - comprehensive hook support - output templating added, supporting e.g. GNU changelog style - Windows, Mac OS X: prebuilt binary packages, better support - many reliability, performance, and memory usage improvements
2006-04-08Correct alignment.minskim1-9/+9
2006-03-14remove a bashism ("select") in the merge scriptdrochner3-3/+48
(this is quite invasive: it disables "FileMerge.app" on MacOS) bump PKGREVISION
2006-03-04Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where nojlam1-2/+2
developer is officially maintaining the package. The rationale for changing this from "tech-pkg" to "pkgsrc-users" is that it implies that any user can try to maintain the package (by submitting patches to the mailing list). Since the folks most likely to care about the package are the folks that want to use it or are already using it, this would leverage the energy of users who aren't developers.
2006-03-04Add missing file to PLIST. Bump PKGREVISION.wiz2-3/+4
2006-03-01update to 0.8drochner3-10/+40
changes: faster status, diff, and commit reduced memory usage for push and pull improved extension API new bisect, gpg, hgk, and win32text extensions short URLs, binary file handling, and optional gitweb skin for hgweb numerous new command options including log --keyword and pull --rev improved hooks and file filtering
2006-02-05Recursive revision bump / recommended bump for gettext ABI change.joerg1-1/+2
2006-01-15Initial import of mercurial-0.7:wiz4-0/+192
Mercurial is a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. Fast * Extremely high-performance delta-compressed storage scheme * Optimized for disk layout and access efficiency * Complete cross-indexing of files and changesets * Bandwidth and CPU efficient HTTP and SSH sync protocols Scalable * Distributed development model supports unlimited numbers of developers * Allows arbitrary merging between developer branches * Doesn't significantly degrade with large numbers of files or changesets * No waiting for locks! Robust * SHA1 integrity checking on repository data * Append-only storage model with transaction journalling * Fast full-repository verification * Convenient backup Easy to use * Most commands are familiar to users of CVS and other systems * Built-in command help * Integrated stand-alone web interface * Works with various GUI tools Easy to adopt * Runs on UNIX, MacOS X, and Windows * Conversion tools available for many popular SCMs * Allows a variety of usage models * Supports user-defined hooks and extensions Free * Source code available under the GPL license * Actively community supported and developed