3 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
wiz
|
d7a2aee037 |
Update to 3.1:
Mercurial 3.1 (2014-08-01) backout: accept '--edit' like other commands creating new changeset bash_completion: add -l|--list support for shelve bookmarks: avoid deleting primary bookmarks on rebase bookmarks: improve the bookmark help (issue4244) branch: add debug message for branch cache write failure bugzilla: stop trying to cache setup across hook invocation build: initial support for in-tree autobuilding recipes buildrpm: include release version in .tar.gz name bundle2: add pushkey support bundle2: fix bundle2 pulling all revs on empty pulls commit: make commit message shown in text editor customizable by template config: allow 'user' in .hgrc ui section (issue3169) convert: detect removal of ".gitmodules" at git source revisions correctly convert: drastically speed up git conversions convert: mercurial source: convert global tags only - not local tags convert: only consider shamap revisions converted if they still exists convert: update the transplant, rebase and graft references in 'extra' diff: add nobinary config to suppress git-style binary diffs discovery: if a push would create a new head, mention the bookmark name if any filemerge: add internal:tagmerge merge tool filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety filemerge: use non-minimal conflict marker regions (BC) gpg: accept '--edit' like other commands creating new changeset graft: customize graft conflict markers (BC) help: always show command help with -h (issue4240) help: suggest keyword search when no topic is found histedit: respect revsetalias entries (issue4311) import: add --partial flag to create a changeset despite failed hunks largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate largefiles: include largefiles when doing log on a directory (issue4241) largefiles: show also how many data entities are outgoing at "hg outgoing" largefiles: use "normallookup", if "mtime" of standin is unset log: allow revset for --follow to be lazily evaluated log: do not use exact matcher for --patch --follow without file (issue4319) log: make --patch --follow work inside a subdirectory make: add a basic osx mpkg target merge: add conflict marker formatter (BC) merge: define conflict marker labels in filemerge() mergetools.hgrc: add minimal configuration for editmerge packaging: move output directory from build/ to packages/ pager: add attend-<command> option patchbomb: includes series information in the header pull: when remote supports it, pull phase data alongside changesets purge: add options for deleting only files or only directories push: use bundle2 to push phases when available qfold: allow to specify '--message/'--logfile' and '--edit' at the same time qimport: record imported revs incrementally (issue3874) qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time rebase: specify custom conflict marker labels for rebase (BC) resolve: abort when not applicable (BC) resolve: don't abort resolve -l even when no merge is in progress resolve: print message when no unresolved files remain (issue4214) resolve: print warning when no work performed (issue4208) revset: maintain ordering when subtracting from a baseset (issue4289) revset: optimize baseset.sub (issue4313) setup: fixed for Pythons which don't have a CFLAGS setup: make Xcode 5.1 check less specific shelve: accept '--edit' like other commands creating new changeset strip: drop -b/--backup option (BC) strip: remove bookmarks after strip succeed (issue4295) templatefilter: add splitlines function templatekw: add 'currentbookmark' keyword to show current bookmark easily templatekw: add 'subrepos' keyword to show updated subrepositories templater: introduce startswith function templater: introduce word function templates: escape NUL bytes in jsonescape (issue4303) update: introduce --tool for controlling the merge tool update: show message when a bookmark is activated by update update: specify custom conflict markers for update (BC) update: when deactivating a bookmark, print a message version: show enabled extensions (issue4209) version: don't traceback if no extensions to list (issue4312) vim: use try catch in vim plugin to avoid conflicts |
||
wiz
|
d24a0c47fc |
Update to 3.0:
Mercurial 3.0 (2014-05-01) This is a regularly-scheduled quarterly feature release. Unlike other 3.0 software releases, this is simply 2.9 + .1, so it should be the usual pain-free upgrade. 1.1. Core features cat: support explicit paths in subrepos cmdserver: allow starting server without repository clone: abort if default destination has no meaningful name (BC) clone: put streaming clones in a transaction color: add debugcolor command (issue4094) color: allow color keywords to be used directly in template commands: add -T as alternative to --template commands: hg debuginstall checks missing templates (issue4151) commit: --edit/-e allows editing commit message supplied through other means config: add initial implementation of --edit (with --global and --local flags) debuginstall: add Python information to debuginstall output (issue4128) demandimport: support HGDEMANDIMPORT=disable to disable demandimport hgweb: add metadata to atom and rss feed entries http: reuse authentication info after the first failed request (issue3567) log: change implementation to use graphlog code push: provide a hint when no paths are configured (issue3692) require: provide a link to a wiki page as well as suggesting upgrade revset: new implementation with incremental evaluation revset: try to handle hyphenated symbols if lookup callback is available revset: add 'only()' revset sshpeer: only print out 'running ssh' messages in debug mode (BC) template: add ifcontains template function template: add pad function for padding output template: add revset() template function template: add shortest(node) template function template: add flexible -T option win32: improve the performance of win32.unlink() over CIFS 1.2. Extension features blackbox: log events related to branch cache convert: avoid updating tags when there is nothing new convert: compare tags from all heads instead of just one convert: replace old sha1s in the description extensions: mark win32text deprecated extensions: remove interhg extensions: remove the inotify extension (BC) histedit: select the lowest rev when looking for a root in a revset (BC) journal: report parsing errors on recover/rollback (issue4172) qimport: allow importing URLs 1.3. Fixes backout: don't limit ancestry check to a single ancestor backout: improve confusing 'cannot backout change on a different branch' abort caches: invalidate store caches when lock is taken cmdserver: forcibly use L channel to read password input (issue3161) cmdserver: reload mq on each runcommand request to avoid corruption diff: use second filename for --stat reporting on git patches (issue4221) dirstate: report bad subdirectories as match.bad, not just a warning (BC) extensions: use normpath to allow trailing '\' on Windows (issue4187) fncache: clean up fncache during strips largefiles: changed overridelog to work with graphlog largefiles: don't prompt when one side of merge was changed but didn't change largefiles: remove directories emptied after their files are moved (issue3515) parsers: fail fast if Python has wrong minor version (issue4110) phases: apply publishing enforcement for "serve" source revlog: deal with chunk ranges over 2G on Windows (issue4215) setup.py: fix C extension compilation issue with OS X 10.9 and Xcode 5.1 subrepo: check return code for git push (issue4223) 1.4. Experimental features bundle2: experimental support for bundle2 merge: experimental implementation of bid merge merge: tell when .ancestor picks one of multiple common ancestors heads |
||
wiz
|
c77ded9020 |
Import py27-mercurial-2.9.2 as devel/py-mercurial.
Mercurial is a free, distributed source control management tool. It efficiently handles projects of any size and offers an easy and intuitive interface. Mercurial efficiently handles projects of any size and kind. Every clone contains the whole project history, so most actions are local, fast and convenient. Mercurial supports a multitude of workflows and you can easily enhance its functionality with extensions. It is easy to learn: You can follow our simple guide to learn how to revision your documents with Mercurial, or just use the quick start to get going instantly. A short overview of Mercurial's decentralized model is also available. And it just works: Mercurial strives to deliver on each of its promises. Most tasks simply work on the first try and without requiring arcane knowledge. |