walk: refactor walk plan - never is gone - reorder tests more cleanly - rename nomatches to exact for clearer semantics

match: remove match.never Only one user, can be translated to match.exact()

walk: use match.bad callback for filetype messages

match: ignore return of match.bad All users returned false, return can now be dropped

add: use match.bad callback more effectively

match: document bad callback semantics

walk: simplify logic for badfn clause - matchfn redundant - call badfn always rather than fwarn - use for/else rather than keep var

walk: we always have a badfn

walk: simplify check for missing file

run-tests: redefine --with-hg so it takes the 'hg' script to run. - in parseargs(), check that --with-hg value is valid - add handy --local option for "--with-hg=../hg" - ensure that we always set PATH and PYTHONPATH (not just when doing a temporary install) - override any existing PYTHONPATH, so test success does not depend on whatever happens to be in the caller's environment - give tests a little more control by exporting $PYTHON to the environment; needed by test-convert and test-mergetool when they run hg with a stripped-down $PATH Also, add a big comment explaining all the corner cases to test for the next person who tries to modify this script.

run-tests: fix _checkhglib() so it's correct when using --with-hg. Since this makes the warning less likely, upgrade it to a "real" warning to stderr.

run-tests: factor out _checkhglib() to check import path of 'mercurial'. - rename _hgpath() to _gethgpath() and move it down next to _checkhglib() - change _gethgpath() so it caches its result: replaces global 'hgpkg' that anyone can use with global '_hgpath' that is only for _gethgpath() - no need to pass 'expecthg' to runchildren() or runtests() anymore Also: do not change global PYTHON when doing coverage; this seems to be unnecessary, since we create a dummy 'hg' script that handles coverage for us, and it made things brittle. (E.g. the rest of this patch makes the call to _hgpath() come later, and it was broken by enabling coverage.)

run-tests: show PID if running in parallel mode with -v. (Extremely handy when you break parallel operation and need to figure out what's going on. The assumption is that if you run with -v, you want more details.)

i18n-da: synchronized and updated slightly

commands: typo in bundle abort message This error trigger if one calls bundle with the wrong parameters and it is thus not an error scripts will want to look for (they could and should ensure that they call bundle with the correct parameters).

fixed typos found in translatable strings This is from a spell-check of hg.pot.

graphlog, win32mbcs: capitalize ASCII

highlight: consistently capitalize Pygments

win32mbcs: capitalize Unicode

commands: expand "arg" -> "argument" in showconfig help strings It is easier to translate full sentences without abbreviations, or said differently, I don't know a short Danish word for "argument".

wrap string literals in error messages

convert/gnuarch: wrap long line, format kwargs without spaces

convert/cvsps: wrap long lines

convert/subversion: wrap long lines in comments

test-hybridencode: break long string literals

revlog: make triple-quoted string a real comment

posix: do not use fstat in isowner The fstat function was undefined, but never used since a stat object was always passed in the optional st argument. Passing st is now mandatory. This bug crept in when util was split up into posix and windows modules. The fstat function is still defined in util, but importing it into posix would create an import cycle which seems unnecessary.

removed unused imports

Move alias into core

mq: rename setheader to updateheader and fix comment

mq: initializing patchheader class directly from patch content The patch header needs only be read in order to instantiate the class, and as such it makes more sense to do it within the class.

Merge with mpm

run-tests: clarify timeout log message.

revlog: refactor chunk cache interface again - chunk to _chunk - _prime to _chunkraw - _chunkclear for cache clearing - _chunk calls _chunkraw - clean up _prime a bit - simplify users in revision and checkinlinesize - drop file descriptor passing (we're better off opening fds lazily

clone: fall back to pull source repo cannot be locked, 937ee88da3ef was a noop 937ee88da3ef was a noop, it was missing the wait keyword

fixed 0xc0150004 error building Mercurial under Python 2.6 for Windows

localrepo: move comment

localrepo: use lock.release for single lock

dirstate: fixed typo in comment

changelog: make delayopener less intrusive

revlog: report indexfile rather than datafile for integrity check

ui: fix two bugs in %% warning

revlog: move stat inside lazyparser

dirstate: notice truncated parents read

lookup: check for dirstate damage on failure

keyword: rename matcher() to match() mimicking changes in main

tests: test for dispatch on [defaults]: more clearly differing output Using '-r null' instead of '-v' as the overriden command default. The latter did not have any effect on output, thus not giving much indication on whether the modified defaults were really in use or not.

merge: whitespace cleanup

revlog: add test for 7659eecd9da2 (issue1678)

changegroup: the node list might be an empty generator (fix issue1678)

store encoding: .i/.d encoding for non-store repo (broken by 810387f59696)

replace "i in range(len(xs))" with "i, x in enumerate(xs)" The remaining occurrences should be the ones where "xs" is mutated or where "i" is used for index arithmetic.

util: simplify range expression The n index variable was unused. Every iteration would pop one element off of parts, so the for loop can be replaced with a while loop.

color: cleanup extra commas

setup: execute hg in C locale

setup: handle trust warnings when determining version

setup: renamed l, e vars to out, err

hggettext: ensure correct Mercurial is imported

Makefile: do not create i18n/, it is already there

replace xrange(0, n) with xrange(n)

color: replace re.split with ui.configlist

color: use lists instead of tuples for effects

hgweb: extract config values after reading webdir-config

tests: make coverage run in parallel mode, clean up coverage code

revlog: fix undefined variable introduced in 5726bb290bfe

parentrevspec: remove a trailing colon

purge: fix spelling error

zsh-comp: explain how to use for non-global install

use ui instead of repo.ui when the former is in scope

cmdutils: Take over glob expansion duties from util

match: fix _patsplit breakage with drive letters

statichttprepo: handle remote not supporting Range headers - If remote does not support Range header, 200 is answered instead of 206. The HTTPRangeHandler left these responses unchanged, so the data has to be sliced by the receiver. - httprangereader file pointer was not updated.

convert: better feedback when filtering out empty revisions Original patch by Herbert Griebel <herbertg@gmx.at>

inotify: server: use a common 'pollable' interface for server & repowatcher Mainly for documentation purposes: it easily explains the role of handle_event and handle_timeout, and why both server & repowatcher implement those methods.

inotify: process all inotify events in one batch When several inotify events happen, we don't have to process each event separately, calling everytime repowatcher.read_events() to fetch events from the underlying watcher: it is sufficient to call once read_events, to fetch all the events from the watcher.

inotify: rename handle_event to handle_pollevent to avoid confusion event here refers to poll events, and are different from events read in server.read_events for example, where those events are inotify events.

inotify: handle_event: do not use event and fd parameters. event is particularly confusing given the context (is it an inotify event? a polling event?) and is never used. Remove it. fd has very little use, and it gives the false impression that event handling depends on fd. It's wrong: the same behavior is triggered, for all events.

inotify: use a decorator instead of dispatching calls

inotify: do not defer inotify events processing Doing a part of the event processing and deferring the rest is a bad habit: it complexifies the code, and it does not respect event ordering! Moreover, there is already a timeout handling, so that inotify events are only processed when a treshold is exceeded: there is no requirement to delay anymore the events processing.

inotify: do not recurse in handle_timeout(): call it explicitely, not in scan() When in handle_timeout, scan() is called when a repertory is created/modified. But the first line of scan calls handle_timeout. This had the consequence of calling recursively handle_timeout: * several calls to read_events (but only the first one retrieves events) * every time that an event is queued for a deferred action, the next time that scan() is called, handle_timeout is called, the event queue is treated, even if all the events haven't been read/queued yet. This could lead to inconsistencies

i18n-da: typo

merge with crew

inotify: adding test for issue1556

inotify: proper fix for issue1542 (partially reverting 67e59a9886d5) issue1542 description: Unknown files (?) placed in a directory are still marked as present and unknown when the containing directory is moved out of the repository scope. Why 67e59a9886d5 was bad: * When the problem we're addressing only deals with unknown files, the fix to updatestatus applies for all statuses * The only reason to move the call schedule_work(wpath, 'd') seems to be that it allowed an updatestatus call on the deleted directory, in deleted(). But deleted() should not be called on directories in the first place. * After fixing an independant issue (1371), test-inotify-issue1542 was failing Fix: When processing a deletion of a directory, walk the tree of the unknown files and remove the entries from repowatcher. This step does not need to be added in the generic scan() routine: it is only necessary on a directory deletion.

inotify: server: refactor updatestatus() * Instead of one entry point, use two entry points, updatefile() and deletefile(), both internally calling the helper function _updatestatus * Do not rely on TypeError to detect the type of oldstatus: use isinstance * The call updatestatus(wpath, None) in deleted() was a bit particular: because no osstat and no newstatus was given, the newstatus was determined using the data stored internally. To replace this exact behavior with the new code, one would use: root, fn = self.split(wpath) d = self.dir(self.tree, root) self.filedeleted(wpath, d.get(fn)) This, however, duplicates code with _updatestatus(), which led us to an interesting question: why are we basing ourselves on repowatcher data to update the status, where everywhere else, we are comparing against dirsate? There is no reason to do this, which is why the new code is: self.filedeleted(wpath, self.repo.dirstate[wpath]) Incidentally, after this, the test for issue1371 passes again.

convert: deprecate external cvsps, to be removed in 1.4

osutil: silence uninitialized variable warning

convert/hg: update documentation

i18n-da: better word for "check"

i18n-da: fixed use of plural form for parent

i18n-da: better Danish word for "entry"

runtest: do not start testing when there is no test

templatefilters: add filter to convert date to local date (issue1674) Issue1674 suggests the localdate filter be applied as default to log, but this patch only introduces the filter, not the changed default behaviour.

url: use CONNECT for HTTPS connections through HTTP proxy (issue967) urllib2 and httplib does not support using CONNECT proxy requests, but only regular requests over the proxy. This does not work with HTTPS requests as they typically require that the client issues a CONNECT to the proxy to give a direct connection to the remote HTTPS server. This is solved by duplicating some of the httplib functionality and tying it together with the keepalive library such that a HTTPS connection that need to be proxied can be proxied by letting a connection be established to the proxy server and then subsequently performing the normal request to the specified server through the proxy server. As it stands, the code also purports to support HTTPS proxies, i.e. proxies that you connect to using SSL. These are extremely rare and nothing is done to ensure that CONNECT requests can be made to these as that would require multiple SSL handshakes. This use case is also not supported by most other contemporary web tools like curl and Firefox3.

dirstate: skip step 3 in walk if nothing new will match nothing will ever match on match.never nothing new will match on match.exact (all found in step 1) nothing new will match on match.match when there is no pattern and there is no direcory in pats

dirstate: set more states in step 1 of walk

match: fold match into _match base class

match: add exact flag to match() to unify all match forms

match: redefine always and never in terms of match and exact

match: fold _globprefix into _roots

match: optimize escaping in _globre - localize re.escape - fastpath escaping of non-special characters

match: remove head and tail args from _globre

match: fold _matcher into match.__init__

match: rename _matchfn to _buildmatch

match: optimize _patsplit

match: tweak some names

match: simplify _matcher - get rid of special case - simplify anypats logic - fold inckinds and exckinds

match: split up _normalizepats

match: optimize _globprefix

match: unnest functions in _matcher

match: kill unused defaults on _globre

match: kill test in matchfn

match: refactor matchfn generation

match: move util match functions over

util: privatize globre

match: refactor patkind add patkind(pat) to match change external users change util.patkind to _patsplit

match: add some default args

match: change all users of util.matcher to match.match

tests: add tests for new pre-push logic (issue736) Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>

named branches: improve pre-push logic (issue736) Each named branch is considered separately, and the push is allowed if no new branch heads are created for any named branch to be pushed. Due to some tests's use of --debug, their output will change after this addition. This has been fixed as well. Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>