Steve Borho <steve@borho.org> [Thu, 31 Jan 2008 22:32:11 -0600] rev 6010
add merge sections to hgrc.5
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6009
filemerge: remove the hgmerge script
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6008
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6007
filemerge: add config item for GUI tools
<tool>.gui indicates whether a tool requires a GUI to run
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6006
merge: add registry look up bits to tool search
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6005
merge: add support for tool EOL fixups
specified with merge-tools:<tool>.fixeol=True
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6004
merge: allow smarter tool configuration
Add [merge-tool] hgrc section with:
<tool>.executable = name or path (<tool>)
<tool>.args = args with $local/base/other/output ($local $base $other)
<tool>.priority = priority (default 0)
<tool>.binary = handles binary (False)
<tool>.symlink = handles symlinks (False)
<tool>.checkconflict = check for conflict markers (False)
<tool>.premerge = try internal simplemerge (True if not binary or symlink)
Four built-in tools: internal:{merge,local,other,fail}
Add [merge-patterns] section of the form:
<pattern> = <tool>
Priority of settings is:
HGMERGE
merge-patterns
ui:merge
merge-tools by priority
hgmerge, if it can be found
Changes:
unsuccessful merges leave .orig files
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6003
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6002
merge: move the bulk of simplemerge into core
- keep existing simplemerge command in contrib
- clean up test interface
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:47:07 -0200] rev 6001
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 02 Feb 2008 21:01:43 +0100] rev 6000
test-serve: wait before killing to always hide the "killed!" message.
Without the sleeps slower systems never display never display "killed!"
while faster systems sometimes or nearly always display it.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 02 Feb 2008 14:55:14 +0100] rev 5999
Mention 'hg update' to switch branches in help for branch and branches.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 02 Feb 2008 14:49:31 +0100] rev 5998
Clarify help for hg status and make it consistent.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:31:46 -0800] rev 5997
profile: expand PID in output file name
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:11:03 -0800] rev 5996
convert: allow synthetic history to be spliced in.
Useful for recreating history in the face of SVN lossage.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:09:45 -0800] rev 5995
profiling: allow CGI and FastCGI to be profiled
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 01 Feb 2008 10:31:15 +0100] rev 5994
update copyright notice in version output
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 01 Feb 2008 10:31:13 +0100] rev 5993
hgweb: explicit response status
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 01 Feb 2008 10:31:09 +0100] rev 5992
updating lsprof.py from remote repository
Christian Ebert <blacktrash@gmx.net> [Thu, 31 Jan 2008 13:57:48 +0100] rev 5991
highlight: update according to latest hgweb_mod changes
Also move encoding workaround completely into non binary condition.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Feb 2008 00:25:32 +0100] rev 5990
Fixed typo: Gnerating -> Generating
Armin Ronacher <armin.ronacher@active-4.com> [Thu, 31 Jan 2008 23:42:21 +0100] rev 5989
added \r for progress counting in churn extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5988
update the branch cache at the end of addchangegroup
This should avoid a bad performance problem when the branch cache is
not up-to-date, and hgweb can't write an updated version because it
lacks permissions.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5987
qpop/qrefresh: update self.applied before calling strip
This will be important for the next patch, which may end up using this
variable during an addchangegroup caused by strip.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5986
hg import: write the dirstate after every commit
This allows the transaction system to backup the correct file, so
that a future rollback can do the right thing.
This should fix issue963.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5985
localrepo._tag: add a seek before writing the new tag
Some systems require a seek (or flush) between read and write
operations on the same file object.
This should fix issue838.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5984
convert: use 'unknown' and '0 0' if commit author or date weren't specified
Closes issue873.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5983
httprepo: use separate handlers for HTTP and HTTPS
This is needed to keep the code in keepalive.py from sharing
the same connection between HTTP and HTTPS.
52ce0d6bc375 explains why we were using a single handler.
This should fix issue892.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5982
move __del__ from httprepository to basehttphandler
This should prevent the next patch from reopening an issue fixed by
0d94e4a3ddb4.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5981
mq: don't allow patches with some reserved names
The current list of reserved names includes only mq control files.
Also, reserve names starting with ".hg" (to avoid troubles with
e.g. .hgignore and .hgtags), and with ".mq" (to allow future
extensions).
This should fix issue841.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5980
mq: pop/refresh: avoid losing revisions not managed by mq
We already disallow committing on top of an mq revision exactly
to avoid losing this new revision during a qpop/qrefresh, so this
can be seen as an additional safety check.
If this is not enough to fix issue844, it should at least prevent
it from happening.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5979
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5978
sshrepo: be more careful while reading data
This should avoid some tracebacks when the server sends some garbage.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:03:46 -0200] rev 5977
fix markup of templates/{,old/}header.tmpl
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:19 -0600] rev 5976
templates: move filters to their own module
This eliminates just about all Mercurial dependencies in templater.py
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:19 -0600] rev 5975
templater: move email function to util
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:19 -0600] rev 5974
templater: remove node import
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:19 -0600] rev 5973
patchbomb: undo backout and fix bugs in the earlier patch
Michele Cella <michele.cella@gmail.com> [Tue, 22 Jan 2008 23:07:23 +0100] rev 5972
added an entry about the prefix option inside the hgrc man page
Michele Cella <michele.cella@gmail.com> [Tue, 22 Jan 2008 23:06:37 +0100] rev 5971
tests for hg serve prefix option
Michele Cella <michele.cella@gmail.com> [Tue, 22 Jan 2008 22:13:29 +0100] rev 5970
hgweb: fixes to make hg serve prefix handling more robust
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:00 -0600] rev 5969
Merge with -stable
Steve Borho <steve@borho.org> [Wed, 30 Jan 2008 10:58:54 -0600] rev 5968
graphlog: skip filectx parents in other filelogs
Jesse Glick <jesse.glick@sun.com> [Fri, 21 Dec 2007 23:21:17 -0500] rev 5967
Provide better context for custom Python encode/decode filters.
While some can function with just some text and an optional command name,
others may want a repository object, a ui object, and a file path.
Use the enhanced information to good effect in win32text.dumbdecode's warning.
Patrick Mezard <pmezard@gmail.com> [Mon, 28 Jan 2008 21:39:47 +0100] rev 5966
Register data filters in a localrepo instead of util
- Changing data filters implementation is easier, adddatafilter() can rewrap
filter after inspecting their prototype
- Custom data filters really belongs to localrepo, mixing them with generic
wrapper like "pipefilter" or "tempfilter" looks wrong.
- util.filtertable should not be accessed from extensions
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 28 Jan 2008 16:35:02 +0100] rev 5965
hgweb: forgot to centralize the req.write() calls in hgwebdir
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 28 Jan 2008 15:10:17 +0100] rev 5964
hgweb: centralize req.write() calls
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 28 Jan 2008 14:58:03 +0100] rev 5963
hgweb: explicitly check if requested command exists
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 28 Jan 2008 13:42:40 +0100] rev 5962
hgweb: get rid of raw-related code in hgweb.filerevision()
Christian Ebert <blacktrash@gmx.net> [Sat, 26 Jan 2008 13:04:36 +0000] rev 5961
keyword: detect restricted commands thru variable
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 22:44:27 +0100] rev 5960
webcommands: add missing hg import
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 20:04:31 +0100] rev 5959
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 14:45:04 +0100] rev 5958
convert: follow svn module parent moves
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 14:45:04 +0100] rev 5957
convert: prevent svn branches to leave the root module tree
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 14:45:04 +0100] rev 5956
convert: checkout svn root revisions
Using changed files is enough if whole history is converted. Checkouts are
required to restrict the conversion to user-supplied subtree.
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 14:45:04 +0100] rev 5955
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 14:45:04 +0100] rev 5954
convert: display source revision id with --verbose
Jesse Glick <jesse.glick@sun.com> [Fri, 25 Jan 2008 19:49:15 -0500] rev 5953
Permitting the import command to accept a --user option.
The prose section of the help text for the command already said that -u and -m
are accepted, but -u was not listed in the table of options, and did not work.
Useful when accepting patches from other people made by hg diff rather than hg
export. For completeness, also accepting -d DATE.
[CHANGES: rebased against d8878742a924, --no-commit option.]
Bryan O'Sullivan <bos@serpentine.com> [Fri, 25 Jan 2008 16:24:00 -0800] rev 5952
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Fri, 25 Jan 2008 16:18:00 -0800] rev 5951
Simplify test-paths
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 26 Jan 2008 01:06:31 +0100] rev 5950
merge with crew
Jesse Glick <jesse.glick@sun.com> [Fri, 25 Jan 2008 15:54:25 -0500] rev 5949
Permit glob patterns to use nested curly braces.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 25 Jan 2008 16:04:46 -0800] rev 5948
Merge after backout
Bryan O'Sullivan <bos@serpentine.com> [Fri, 25 Jan 2008 16:04:32 -0800] rev 5947
Backed out changeset dc6ed2736c81
Christian Ebert <blacktrash@gmx.net> [Tue, 22 Jan 2008 13:12:43 +0100] rev 5946
keyword: improve use of dicts
- actually use iteritems() when we iter over items of a dictionary
- store commit hooks in dictionary
(safe, as hook.hook() sorts before execution)
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 10:39:19 +0100] rev 5945
keyword: no expansion on qfold (bugfix)
Bryan O'Sullivan <bos@serpentine.com> [Fri, 25 Jan 2008 15:56:22 -0800] rev 5944
Merge with crew
Jesse Glick <jesse.glick@sun.com> [Tue, 08 Jan 2008 22:40:51 -0500] rev 5943
Ensure that absolutized paths from hgrc do not contain ../ segments.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 26 Jan 2008 00:14:20 +0100] rev 5942
glog shows at most one file: correct synopsis
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 25 Jan 2008 21:09:14 +0100] rev 5941
Update usage message in test-glog.out
AKA: Remind Thomas to run tests even after trivial changes.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 25 Jan 2008 20:17:48 +0100] rev 5940
Add back elipsis to [OPTION] that was stolen by 56e8a54bf71d
Steve Borho <steve@borho.org> [Fri, 25 Jan 2008 10:35:04 -0600] rev 5939
graphlog: add test for filelog graph
Steve Borho <steve@borho.org> [Fri, 25 Jan 2008 10:28:21 -0600] rev 5938
graphlog: add filelog revision grapher
Graph a filelog's DAG, e.g.: hg glog mercurial/util.py
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 25 Jan 2008 16:18:49 +0100] rev 5937
Test case for hg import --no-commit
Joel Rosdahl <joel@rosdahl.net> [Fri, 25 Jan 2008 13:48:35 +0100] rev 5936
Add --no-commit option to import command
Matt Mackall <mpm@selenic.com> [Wed, 30 Jan 2008 17:30:34 -0600] rev 5935
win32: remove excessive flushing
Our Windows file code was flushing buffers from the operating system
to disk, rather than from the application to the operating system.
Patrick Mezard <pmezard@gmail.com> [Sat, 26 Jan 2008 19:55:04 +0100] rev 5934
convert: hg.clonebranches must pull missing parents (issue941)
Kirill Smelkov <kirr@mns.spb.ru> [Wed, 23 Jan 2008 21:49:44 +0300] rev 5933
qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru> [Wed, 23 Jan 2008 21:49:39 +0300] rev 5932
qrecord: record complements commit, so qrecord should complement qnew
Also there is an idea flying around to create something that will complement
qrefresh:
- maybe 'qammend'? or
- 'qrefresh --interactive'?
If we settle on '--interactive', then it would be conveniet to add this flag to
'commit' and 'qnew' as well.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 23 Jan 2008 17:16:33 +0100] rev 5931
Remove unneeded "import os.path"
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Jan 2008 14:28:25 +0100] rev 5930
send conservatively capitalized HTTP headers
Ali Gholami Rudi <aligrudi@users.sourceforge.net> [Wed, 16 Jan 2008 19:14:54 +0330] rev 5929
demandimport: handling new relative imports
Mercurial does not work on python2.6 because __import__ takes an
additional argument called level. This patch merely calls the
built-in __import__ when level is passed.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 10:45:55 +0100] rev 5928
hgweb: move HTTP content types out of header templates
This removes the ability for templates to add custom HTTP headers, which can
easily be re-added if someone needs it. Thanks to asak for repeatedly reviewing
this patch and helping to iron out the quirks.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 10:45:52 +0100] rev 5927
hgweb: revert to showing file instead of offering for download
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 12:31:55 +0100] rev 5926
hgweb: be sure to send a valid content-type for raw files
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 09:28:51 +0100] rev 5925
hgweb: use ErrorResponse instead of custom response
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 09:11:11 +0100] rev 5924
better error reporting for hg serve errors in tests
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 09:11:08 +0100] rev 5923
hgweb: fix a stupid KeyError introduced in a0e20a5eba3c
Thanks to Christian Ebert for finding this. Also added a test to prevent this
from happening again.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jan 2008 09:11:06 +0100] rev 5922
hgweb: cleanup buglet introduced in 956afc025c0f
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Jan 2008 00:55:01 +0100] rev 5921
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Jan 2008 00:16:50 +0100] rev 5920
CVS convert: Find correct parent for new branch (issue704)
Previously the parent was determined by the last changeset where the branched
file was changed even if the branch is based on an earlier revision.
Fix written by mpm.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Jan 2008 00:08:43 +0100] rev 5919
Test for converting a CVS branch
Patrick Mezard <pmezard@gmail.com> [Mon, 21 Jan 2008 22:24:28 +0100] rev 5918
convert: mercurial sink must be local
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 21 Jan 2008 22:00:44 +0100] rev 5917
Fix double import of 're'.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 21 Jan 2008 21:44:16 +0100] rev 5916
convert: Do not abort with TypeError if svn commit message is None (issue934)
Christian Ebert <blacktrash@gmx.net> [Sun, 20 Jan 2008 14:39:25 +0100] rev 5915
Prefer i in d over d.has_key(i)