log speedup: use list.extend to avoid an explicit loop

log speedup: use parentrevs in log and changeset_printer.show

log speedup: set quiet/verbose/debugflag in the fake ui object

log speedup: use only ui.write in changeset_printer.show - ui.status is not very useful, since this code is never executed when ui.quiet is true. - explicitly checking for ui.debug allows a regular hg log to run without looking at the manifest index - the calls to ui.note were converted for consistency

log speedup: walkchangerevs: filter the files only if we need them This speeds up hg log and significantly reduces memory usage (max RSS goes from ~92MB to ~21MB on the kernel repo), since we no longer store all the revisions in the cache.

Inform the user about the new URL when being redirected via http. Additionally the changed code ensures that the new URL is used, even if it doesn't end with the query string.

Stripping of query string (since 88b4755fa48f) stripped too much (issue327) rstrip(qs) not only strips qs from the right, but it continues stripping every char at the end of the URL that occurs on qs.

Merge with upstream

Turn bundle file into a string for http push, for urllib2 over proxies.

Force the content-length header to be a string in httprepo.unbundle. (Needed for Python2.3 compatibility)

Use the new UnexpectedOutput exception in httprepo, too.

New UnexpectedOutput exception to catch server errors in localrepo.stream_in If the unexpected is a string, the empty string will be mentioned, and long strings are cut to at most 400 chars.

Some clarifications for pull/push protocols: - List file:// and static-http:// - Mention that you can pull from bundle files - List http and https as valid push targets, but emphasize that this feature has to be enabled.

httprepo: record the url after a request, makes pull + redirect works POST+redirect doesn't work in python, as a workaround we record the url from the previous GETs so that when we do a POST it uses the redirected url fix issue327

add AIX to the list of compilers that don't have inline keyword

zsh: support remote URLs

zsh: suppress mq completion error messages outside of repository

zsh: suppress error message for status completion outside of repository

Turn of "Not trusting file" logging when running hgweb and hgwebdir (hg serve still shows the warning)

use untrusted settings in hgwebdir

use untrusted settings in hgweb The only exceptions are web.static and web.templates, since they can be used to get any file that is readable by the user running the CGI script. Other options can be (ab)used to increase the use of the cpu (allow_bz2) or of the bandwidth (server.uncompressed), but they're trusted anyway.

add untrusted argument to patch.diffopts

add --untrusted to showconfig

save settings from untrusted config files in a separate configparser This untrusted configparser is a superset of the trusted configparser, so that interpolation still works. Also add an "untrusted" argument to ui.config* to allow querying ui.ucdata. With --debug, we print a warning when we read an untrusted config file, and when we try to access a trusted setting that has one value in the trusted configparser and another in the untrusted configparser.

Only read .hg/hgrc files from trusted users/groups The list of trusted users and groups is specified in the [trusted] section of a hgrc; the current user is always trusted; "*" can be used to trust all users/groups. Global hgrc files are always read. On Windows (and other systems that don't have the pwd and grp modules), all .hg/hgrc files are read. This is essentially the same patch that was previously applied as revision 494521a3f142.

zsh: add revrange completion

zsh: add qbase and qtip to qapplied completions

zsh: use standard tags where possible

mq: support qimport -

hgcommand.vim: doc install delete into "black hole", g: prefix global vars.

merge with crew

Corrected hg synopsis.

zsh: complete qguard with +/- guard prefixes

hgcommand.vim: remove deprecated -b option from hg parents.

zsh: complete qapplied, qdiff, qfold, qguard, qimport, qnext, qprev as well as qrename, qselect, qseries, qunapplied and qtop.

Merge with mpm

zsh: make option lists more compact

Merge with mpm

zsh: rewrite This version of zsh completion handles global options more correctly, completes options for command abbreviations, and does much more lazy evaluation.

small refactoring of path normalization in dirstate.statwalk

Make util.unique return a list

Simplify ignore logic in dirstate.walk - kill blockignore hack - pull pconvert out of imatch - skip imatch when not ignoring

shortname: truncate at '.' too

improve walk docstrings

convert dict(zip(x,x)) to dict.fromkeys(x)

minor hg grep simplification

simplify dirstate walking - kill walkhelper - stop passing dc around - remove unused stat arg from statmatch (renamed imatch)

kill makewalk function

Pull getchange out of walkchangerevs

Make revrange return a list of ints so that callers don't have to convert

simplify revrange and revpair

lookup(str(x)) -> lookup(x)

Fixups for hg grep - kill trimuser function - remove ucache - simplify descending logic - fix files with matches logic - correct tests

Update tests for removed commands

Remove update -m, deprecated for 0.9.1

Remove the undo command, deprecated pre-0.9

Remove forget command, deprecated pre-0.9

Fix excessive complaining from hg log -b

Remove some more deprecated options from help syntax summaries

Hide deprecated flags in help unless verbose

Remove old fish-merge test

Merge with crew

Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.

fix graph traversal in commands.bundle (it wasn't O(n))

Corrected help text for bundle.

Corrected synopsis of hg heads

Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.

revlog.py: always return tuples from parents and parentrevs There's at least one place doing parentrevs(rev) != (rev-1, -1), which is always true with revlog v0, since parentrevs returns a list in this case.

Some README updates

Remove some old documentation that belongs on the wiki

Move rewrite-log to contrib

Remove [-b] options from help syntax lines

Deprecate old --branch/branches options

add branch and branches commands

test-mq-caches: look up a revision that does not exist to force cache creation

Merge with mpm

hgweb: add heads to gitweb summary

zsh: cache hg help output

zsh: complete according to the -R option if specified

zsh: add view opts

zsh: add --style and --template opts

zsh: add -r to parents

zsh: expand tags lazily

make mq play nicely with the branch cache - if no patches are applied, don't do anything different - if the cache includes valid data from one of the patch revisions, use the cache, but don't save anything new - if the cache has data from before the patch revisions only, save what the list of branches would be without the patch revisions

Split branchtags into two additional functions. This makes it easier to override only parts of the cache saving process.

Merge with crew

Commit username: Better error message, abort on empty name, fix documentation.

hgweb: make #motd# available for all templates

zsh completion: basic mq support

bash_completion: qguard

bash_completion: allow overriding completion for arguments that start with "-"

bash_completion: qfold, qrename, qheader, qclone and qselect

bash_completion: email --bcc

bash_completion: qdelete --rev

bash_completion: make export fall back to tags when there's no mq patch applied

bash_completion: don't complete export with "garbage" when mq is not around The "garbage" is the output of hg help printed when a command is not found.

Fix "templater object got multiple values for keyword argument 'motd'" caused by adding motd to the call to the index template (2896ce093ec4)

Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.

gitweb: add revision numbers to annotate changeset links

gitweb: add revision numbers to filerevision changeset links

hgweb: add revision numbers to changeset parent/child links

fix errors spotted by pychecker

use xrange instead of range

use xrange instead of range

Corrected SSH configuration example in pull help.

revlog.children: use parentrevs instead of parents

Don't use test -e in tests - sh doesn't like it on Solaris

Update tests output

Add --rev option to status

makes username mandatory

patch: return list of modified files even when an exception is raised The file list is passed in as an argument and updated in place. This fixes issue399.

mq: test case for issue399

Extended templating test for new branches and extra changeset info.

Added extra changeset info to templater and map-cmdline.default.

Add new branch info to templater and use it in map-cmdline.default. The template currently shows old (hg log -b style) branch tags, too, but not in the same way as the built in changeset_printer.

Don't show empty list of files in hg log -v.

Adjust default cmdline style to really match verbose/debug log.

Show extra changeset info for log/tip/heads/... --debug

localrepo: add separate methods for manipulating repository data This change adds new methods sjoin and sopener for accessing the following elements: - changelog - manifest - data/ - journal and undo log - repo lock This will simplify sharing this data and escaping paths

Minor tags optimization

Use file contexts in tags code

filecontext: report False for missing files

Only look up tags and branches as a last resort

If we can't write the branch cache, fail quietly.

Add test for invalid branch cache (fixed by 27ebe4efe98e)

invalidate the branch cache when sanity check fails

Testing the new changegroupsubset remote function in the ssh and http protocols.

Stop erroring out pull -r and clone -r if repository isn't local.

sshrepo: add passing of lookup exceptions

Adding changegroupsubset and lookup to ssh protocol so pull -r and clone -r can be supported.

httprepo: add support for passing lookup exception data

Adding changegroupsubset and lookup to web protocol so pull -r and clone -r can be supported.

Improve branch cache sanity check for mq

merge: fix branch setting (and remove debugging message)

imported patch foo

commit: read branch with workingctx

branchtags: use changectx setting self.branchcache on entry avoids recursions in lookup

revlog.lookup tweaks - fast path for binary node ids - direct lookup for full hex ids - silly change to bin_id

Merge with crew

use ui.readsections in the acl extension

use ui.readsections in the bugzilla extension

use ui.readsections in the notify extension

add ui.readsections Given a file name and a set of sections, this function reads the file and adds only the specified sections to the configuration data.

Default editor for Windows installer is now notepad. [Issue 256]

Document the change in MacPython distutils installation location

Added *.bin to MANIFEST.in to include binfile.bin

bundlerepo: avoid exception in __del__ when the bundle doesn't exist $ hg -R bundle://foo.hg abort: No such file or directory: foo.hg Exception exceptions.AttributeError: "'bundlerepository' object has no attribute 'bundlefile'" in <bound method bundlerepository.__del__ of <mercurial.bundlerepo.bundlerepository object at 0xa7ab9fac>> ignored

portability fixes for some tests Apparently the ls on OS X 10.3.9 exits with success even if the file given on the command line doesn't exist

Explicitly use "tip" in revision navigation. Rationale: the tip revision is a moving target and if somebody wants tip, it should be delivered.

Add a test for the acl extension

Use a case-sensitive version of SafeConfigParser everywhere This change has the potential to break existing setups, but the current behaviour (the keys in configuration files are always lower-cased) can bite us in a few places: - no way to use a Command in [defaults] - hgext.Extension doesn't work in [extensions] - you can't use an Upper/case/PATH in the [paths] section of hgweb.config - you can't (easily) protect paths with upper-case letters with the acl extension - you can't specify a /Path/TO/a/rEPO in the [reposubs] section for the notify extension

Fix test-oldcgi after navbar update

Fix RSS URLs (closes issue396)

Convert changenav bar from revisions to hashes (closes issue189)

Merge with crew

Add some basic branch name tests

Add branch support to commit

Make lookup aware of branch labels adjust precedence order slightly: - '.' - tags - branch labels - revlog order

Add branchtags function with cache - cache stores tipmost node and rev and node,label pairs - if cache is out of date, scan new changesets - write new cache out after scan

Update branch on checkout/update

Report branch for hg id

Report branch for hg log and friends

Add branch method to contexts

imported patch b1

add footer to old style

fix rss template

Fixed page overlap for file revision links in hgweb. This is another step to fix issue189, but currently the file revision numbers are read as changeset revision numbers, so the link will point to the wrong revision.

merge with main

hgweb: hoist changenav up, and use it in the filelog

hgweb: link to file parents in filediff, rather than changeset parents

Test annotate using named rev instead of linkrev

Fix annotate where linkrev != rev without exporting linkrev

Back out d8eba1c3ce9b and a004164dbeef

Make annotate use linkrev instead of rev

Add linkrev to filectx

merge: if filemerge skips merge, report as updated

Catch python2.3's IndexError with bogus http proxy settings. (issue203)

Fixed contrib/hgdiff script to pass diffopts in the new format.

document the diffstat option of the notify extension

hgweb: add diff links in gitweb file revision page

hgweb: add changeset description to file revision page

hgweb: really fix parent/child rename links

hgweb: better file rename links

hgweb: fix parent/child links across renames

hgweb: add changeset description to annotate page

make revlog.addgroup pass its file handles to addrevision This should fix issue255. It looks like the problem there happens when addgroup calls addrevision to add a full revision, and addrevision decides to split the index file into a .i/.d pair. Since addgroup has an open file handle for the index file, the renaming of the new .i file to its final name fails on windows.

Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)

merge with upstream

use short hashes with diff -v

Use manifest rev instead of changelog rev for linear manifest test

Removed unused imports of mdiff and templater from ui.py

log --copies: use manifest.find instead of delta when manifest parent is not rev-1 This fixes issue391.

Test case for log --copies on non-linear manifests (issue391)

hgweb: fix path cleaning

Merge with asak

portability fix for test-ssh The __del__ method of sshrepo reads the stderr of the remote process until EOF and prints it. If an exception is raised, this method ends up being called: - on Linux: after the "abort: ..." message is printed - on OS X: before the "abort: ..." message is printed This patch explicitly flushes the stderr of the remote process before raising a RepoError.

Merge with mpm

Add popen2 demandload to patch.py, required by diffstat

rawcommit: add removed files to the changelog file list patch by tonfa.

Update test-mq-qdelete to use qdel -r

mq: make qdelete without -k or a subrepository delete all patches

Use line length field when extracting git binary patches

mq: change qdel --forget to --rev; accept any revision symbol

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update

merge: turn followcopies on by default

mq.el: add mode-line hook

python2.5 PyArg_ParseTuple fix Python 2.5 doesn't like it when we mix str objects and the "t#" format in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4 and 2.5.

Add test for git binary diff support

Add git-1.4 binary patch support

gitweb: Fixed parent/child links when viewing a file revision.

Keep session variables when linking from hgwebdir's index to repositories.

Fixed typo in gitweb templates.

hgweb: Apply the new method of passing session variables to links.

hgweb: Keep session variables (currently only style) in HTML forms, too. Adjusted default and gitweb template for this.

templater: Better exception for errors in foo%bar formatting.

nodesbetween: fix a bug with duplicate heads

hgweb: trap lookup errors

Add better error message for bad commands

gitweb: Add error text to error page

gitweb: fix link on file name in filenodelink

gitweb: fix last change field in summary

Merge with main

gitweb: add file diff view

Merge with crew

merge with crew

update ui.quiet/verbose/debug/interactive every time the config changes - ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata settings - the quiet, verbose, debug and interactive options from the [ui] section from .hg/hgrc files are respected for commands that open the repo - setting ui.quiet/verbose/debug/interactive with --config works - the command line options always override the hgrc settings - previously it wasn't possible to override a [ui] debug = True. --debug still takes precedence over --quiet and --verbose.

ui.py: untangle updateopts The code in ui.updateopts that handles ui.quiet, ui.verbose and ui.debugflag is too smart, making it somewhat hard to see what are the exact constraints placed on the values of these variables, hiding some buglets. This patch makes these constraints more explicit, fixing these buglets and changing the behaviour slightly. It also adds a test to make sure things work as expected in the future. The buglets: - setting ui.debug = True in a hgrc wouldn't turn on verbose mode - additionally, setting ui.quiet = True or using --quiet would give you a "quiet debug" mode. The behaviour change: - previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e. the final result would be quiet mode), but --verbose wins against --quiet - now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet. As a consequence, using -qv always gives you normal mode (unless debug mode was turned on somewhere)

call ui.updateopts only after changing directories This corrects --config paths.foo=bar when it's used with --cwd

ui.py: normalize settings every time the configuration changes Previously, we would normalize settings (e.g. turn relative paths into absolute ones) only after reading a config file. Now "--config paths.foo=bar" will use the cwd to make "bar" an absolute path.

move the parsing of --config options to commands.py

ui.py: use the overlay to hold --config data This allows the ui class to know that these items have a higher priority without further help from commands.py.

ui.py: change the overlay from a dict to a SafeConfigParser. This also fixes what's probably a bug - configitems was ignoring the overlay.

ui.py: don't query parentui.cdata when looking up config items. We copied the contents of parentui.cdata on initialization.

ui.py: make walkconfig use configitems Also make it sort the available config sections while we're at it.

ui.py: move common code out of config and configbool

ui.py: remove revlogopts and (unused) diffcache variables This should make the [revlog] section in a .hg/hgrc file be respected when there's still no changelog.

ui.py: don't let parent and child ui objects share header and prev_header

ui.py: use correct parentui while copying readhooks

changectx: search manifest delta for filenode

context: check self.__dict__ instead of using hasattr hasattr implicitly calls getattr, instantiating the field it is checking for.