Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4950
dirstate: add __contains__ and make __getitem__ more useful
dirstate.state(f) == '?' -> f not in dirstate
dirstate.state(f) -> dirstate[f]
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4949
dirstate: make wjoin function private
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4948
dirstate: break update into separate functions
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4947
dirstate: use True and false for _dirty
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 17:56:30 +0200] rev 4946
test-alias: Removed fallback to parentui, no longer needed since 10afa3fab6b4
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 17:37:39 +0200] rev 4945
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 17:36:45 +0200] rev 4944
Make [defaults] in .hg/hgrc work.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 20 Jul 2007 09:44:50 +0200] rev 4943
fix bogus close spotted by pychecker (no close() in global scope)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 10:43:29 +0200] rev 4942
Remove unused pprint import and the commented line which used it before.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 10:39:42 +0200] rev 4941
Use format string for lockname again (was changed by 3e25a6eb5c9a)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 10:36:51 +0200] rev 4940
Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy.
I have tried Debian's default emacs and the current CVS version. Default emacs
doesn't have highlighting enabled (and being emacs-illiterate I don't know how
to enable it) and the CVS emacs' Python highlighting has no problems with '
characters here.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Jul 2007 10:30:51 +0200] rev 4939
removed trailing whitespace
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 20 Jul 2007 09:31:32 +0200] rev 4938
fix unused variables reported by pychecker
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jul 2007 18:39:51 +0200] rev 4937
churn: get current terminal width if possible
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 19 Jul 2007 19:48:24 -0300] rev 4936
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 19 Jul 2007 19:43:25 -0300] rev 4935
dirstate.invalidate: avoid rebuilding _map
Since hasattr will call __getattr__, the call to hasattr(self, '_dirs')
will end up reparsing the dirstate file.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 19 Jul 2007 19:43:25 -0300] rev 4934
add dirstate._dirtypl variable
Theoretically, it's possible to forget modified dirstate
parents by doing:
dirstate.invalidate()
dirstate.setparents(p1, p2)
dirstate._map
The final access to _map should call _read(), which will
unconditionally overwrite dirstate._pl.
This doesn't actually happen right now because invalidate
accidentally ends up rebuilding dirstate._map.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 19 Jul 2007 19:43:25 -0300] rev 4933
archive: delay extraction of file revisions
This allows us to look only at the filelogs we're interested in,
providing a nice speedup if we're archiving only part of a repository.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 19 Jul 2007 19:43:25 -0300] rev 4932
help: avoid traceback if an extension has only debug commands
Bryan O'Sullivan <bos@serpentine.com> [Thu, 19 Jul 2007 15:33:21 -0700] rev 4931
convert/subversion: rehandle the no-tags case
Bryan O'Sullivan <bos@serpentine.com> [Thu, 19 Jul 2007 15:29:33 -0700] rev 4930
Print meaningful error message if os.symlink fails
Bryan O'Sullivan <bos@serpentine.com> [Thu, 19 Jul 2007 15:13:48 -0700] rev 4929
lock.py: cache hostname, but not pid, in case we fork
Bryan O'Sullivan <bos@serpentine.com> [Thu, 19 Jul 2007 12:41:07 -0700] rev 4928
convert/subversion: work around memory leak in svn's python bindings
The svn.ra.get_log wrapper attaches the hash of changed paths for every
log entry to a global memory pool, so memory consumption increases
rapidly, with no way to free it.
Our workaround is to call this function in a child process, and feed
its results back over a pipe. The memory consumption of the child still
grows huge (hundreds of megabytes), but at least it goes away once the
reading-the-log phase is done.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 22:46:14 -0700] rev 4927
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 22:44:25 -0700] rev 4926
convert/subversion: Simplify callback.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Jul 2007 07:28:27 +0200] rev 4925
merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 14:00:55 -0700] rev 4924
Simplify update.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 13:56:08 -0700] rev 4923
Better fix for issue 622 than we had in c4dd58af0fc8.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 19:56:36 -0700] rev 4922
convert/subversion: reduce memory usage by filtering early
This makes up to a 50% difference in memory consumption.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 19:47:22 -0700] rev 4921
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 17:44:52 -0700] rev 4920
convert/subversion: get converter working against plain HTTP.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 14:00:55 -0700] rev 4919
Simplify update.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 18 Jul 2007 13:56:08 -0700] rev 4918
Better fix for issue 622 than we had in c4dd58af0fc8.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Jul 2007 16:46:20 +0200] rev 4917
merge with main
Matt Mackall <mpm@selenic.com> [Tue, 17 Jul 2007 15:26:28 -0500] rev 4916
doc: typo, -x bit
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Jul 2007 16:46:01 +0200] rev 4915
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Jul 2007 16:41:45 +0200] rev 4914
fix test-tag on Solaris
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 20:15:03 -0700] rev 4913
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 18:01:20 -0700] rev 4912
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 16:50:47 -0700] rev 4911
mq: autodetect an existing git patch during qrefresh (issue 491)
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:53:44 -0700] rev 4910
replace .hgtags instead of appending to it when doing a raw commit
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:34:35 -0700] rev 4909
handle nonexistent .hgtags in raw _tag
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 15:47:32 -0700] rev 4908
convert/subversion.py: str.rsplit is not available in Python 2.3
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 15:26:27 -0700] rev 4907
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 15:24:59 -0700] rev 4906
convert/subversion.py: fix bad assumptions about SVN path naming
The SVN converter assumed that the trunk and branches paths were fixed,
and immediately under the base of the SVN URL. Fix the second assumption,
and allow the trunk and branches paths to be reconfigured.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 13:08:50 -0700] rev 4905
convert/subversion.py: escape quotes to make code readable in Emacs
Patrick Mezard <pmezard@gmail.com> [Tue, 17 Jul 2007 23:35:24 +0200] rev 4904
patch: patches should be read and written in binary mode when possible.
Patrick Mezard <pmezard@gmail.com> [Tue, 17 Jul 2007 23:34:52 +0200] rev 4903
patch: fix normalized paths separators.
Patrick Mezard <pmezard@gmail.com> [Tue, 17 Jul 2007 23:33:42 +0200] rev 4902
posixfile_nt: '+' was understood as read mode instead of update.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4901
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4900
patch.py: re-add the ability to use an external patch program
This is now invoked by default only if ui.patch is set. Otherwise, we
use our built-in patch. If that fails because it can't find any valid
hunks, we'll fall back to trying the external patch command.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4899
patch.py: don't mark files as changed unless they have actually been changed
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4898
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4897
Add Chris Mason's mpatch library.
The original repo is http://oss.oracle.com/mercurial/mason/mpatch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:28:01 -0300] rev 4896
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:08:29 -0300] rev 4895
convert: manually set encoding to UTF-8
Right now the backends assume we're working in UTF-8 and there's
no good way to ignore the encoding when adding revisions.