Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 15:26:27 -0700] rev 4926
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 15:24:59 -0700] rev 4925
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 4924
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 4923
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 4922
patch: fix normalized paths separators.
Patrick Mezard <pmezard@gmail.com> [Tue, 17 Jul 2007 23:33:42 +0200] rev 4921
posixfile_nt: '+' was understood as read mode instead of update.
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:18:42 -0500] rev 4920
revlog: privatize some methods
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:18:24 -0500] rev 4919
revlog: delete unused function makenode
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:18:21 -0500] rev 4918
revlog: raise offset/type helpers to global scope
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:10 -0500] rev 4917
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:10 -0500] rev 4916
Use a weakref for recursive transactions
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:10 -0500] rev 4915
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4914
repo locks: use True/False
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4913
rename and simplify do_lock
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4912
simplify dirstate fixups in repo.status()
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4911
dirstate: add doesn't need to call stat
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4910
use context for part of localrepo status
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4909
context: add __contains__, __getitem__, and __iter__
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4908
dirstate: get rid of default args for status
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4907
dirstate: make filterfiles private
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4906
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 4905
dirstate: make wjoin function private
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4904
dirstate: break update into separate functions
Matt Mackall <mpm@selenic.com> [Sat, 21 Jul 2007 16:02:09 -0500] rev 4903
dirstate: use True and false for _dirty
Matt Mackall <mpm@selenic.com> [Tue, 17 Jul 2007 15:26:28 -0500] rev 4902
doc: typo, -x bit
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.