Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:53:10 -0600] rev 6014
mergetools: correct vim typo
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:51:56 -0600] rev 6013
filemerge: handle missing regappend
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:08:16 -0800] rev 6012
util_win32: add missing valname param to query_val function
Steve Borho <steve@borho.org> [Sun, 03 Feb 2008 22:27:53 -0600] rev 6011
filemerge: two fixes for kdiff3 example configuration
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)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 21 Jan 2008 13:37:27 -0200] rev 5914
fix test-strip-cross on solaris
Apparently "ENVVAR=value command" doesn't work when command is a shell
function.
Reported by Richard Lowe.
Patrick Mezard <pmezard@gmail.com> [Mon, 21 Jan 2008 14:15:38 +0100] rev 5913
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Jan 2008 08:12:07 -0200] rev 5912
test-strip-cross: test handling of linkrev crosses in the manifest
Richard Lowe <richlowe@richlowe.net> [Sat, 19 Jan 2008 22:16:15 -0500] rev 5911
Fix test-strip-cross on Solaris
Solaris /sbin/sh doesn't do brace expansion
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5910
simplify revlog.strip interface and callers; add docstring
Also, strip files only after the changelog and the manifest.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5909
strip: calculate list of extra nodes to save and pass it to changegroupsubset
When we remove revision N from the repository, all revisions >= N are
affected: either it's a descendant from N and will also be removed, or
it's not a descendant of N and will be renumbered.
As a consequence, we have to (at least temporarily) remove all filelog
and manifest revisions that have a linkrev >= N, readding some of them
later.
Unfortunately, it's possible to have a revlog with two revisions
r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2). If we try
to strip revision linkrev(r1) from the repository, we'll also lose
revision r2 when we truncate this revlog.
We already use changegroupsubset to create a temporary changegroup
containing the revisions that have to be restored, but that function is
unable to detect that we also wanted to save the r2 in the case above.
So we manually calculate these extra nodes and pass it to changegroupsubset.
This should fix issue764.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5908
changegroupsubset: accept list of per-revlog nodes to include
This will allow strip to include in the temporary changegroup some extra
file/manifest revisions that should be restored after the truncations.
This code doesn't allow specification of changelog nodes since I won't
need that right now, the code wouldn't be tested and it's probably
possible to do something similar enough by using the bases/heads
arguments.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5907
addchangegroup: add option to skip check for empty changelog group
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5906
allow the creation of bundles with empty changelog/manifest chunks
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5905
repair.py: don't use nested functions.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5904
repair.py: use revs in limitheads
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5903
repair.py: add a docstring to bundle; use repo.ui
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5902
repair.py: split stripall into two functions; clean it up a bit
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5901
repair.py: rename chlog to cl
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5900
repair.py: nodes are nodes, revs are revs
Use "striprev" instead of just "rev" to make the patch a bit less
confusing. This is also a bit clearer than just "revnum".
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5899
repair.py: use node.* directly
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Jan 2008 18:01:16 -0200] rev 5898
repair.py: don't import commands.py
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Jan 2008 23:59:40 +0100] rev 5897
test-no-symlinks: fix unbundle output
Patrick Mezard <pmezard@gmail.com> [Sat, 19 Jan 2008 14:48:31 +0100] rev 5896
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 19 Jan 2008 13:19:27 +0100] rev 5895
Merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Jan 2008 03:06:01 +0100] rev 5894
keyword: add very simple mq test
Bryan O'Sullivan <bos@serpentine.com> [Fri, 18 Jan 2008 17:01:28 -0800] rev 5893
Fix typo.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 18 Jan 2008 13:54:33 -0800] rev 5892
Fix test output
Bryan O'Sullivan <bos@serpentine.com> [Fri, 18 Jan 2008 13:49:11 -0800] rev 5891
Merge with crew
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 18 Jan 2008 19:53:38 +0100] rev 5890
hgweb: fast path for sending raw files
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 18 Jan 2008 19:53:38 +0100] rev 5889
hgweb: just return iterables instead of yielding them
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 18 Jan 2008 19:53:38 +0100] rev 5888
hgweb: separate out start_response() calling
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 18 Jan 2008 19:53:38 +0100] rev 5887
hgweb: return iterable, add deprecation note
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 18 Jan 2008 19:53:38 +0100] rev 5886
hgweb: remove some legacy code
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jan 2008 14:39:53 +0100] rev 5885
keyword: avoid extra diffs when not comparing against working dir
When diffing against specified revisions expanded keywords
only get in the way.
Update test output.
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jan 2008 13:58:22 +0100] rev 5884
keyword: support mq; handle (q)record more gracefully
mq:
Ensure that expanded keywords do not make it into patches.
- disable expansion when reading filelog
- shrink expanded keywords when reading from working dir (wread)
(q)record:
Avoid additional hunks due to expanded keywords. However this is
still a compromise, as keyword expansions are not updated in
working directory because record should not overwrite files.
Mention above shortcomings and "hg kwexpand" workaround in help
and update test output.
system argument parsing:
Command detection might be slightly more expensive with
dispatch._parse, but we will need this for improving "hg diff"
output.
Patrick Mezard <pmezard@gmail.com> [Mon, 21 Jan 2008 10:04:35 +0100] rev 5883
convert: enforce svn_source.getchanges() files unicity
Patrick Mezard <pmezard@gmail.com> [Mon, 21 Jan 2008 10:02:32 +0100] rev 5882
localrepo: ensure files unicity in commit() (issue 714)
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5881
util: simplify unique
Patrick Mezard <pmezard@gmail.com> [Sat, 19 Jan 2008 14:39:30 +0100] rev 5880
convert: fix invalid svn.ra.check_path() call (issue 771)
The svn transport must be reparented to repository root before using
check_path() with full entrypaths.
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Jan 2008 23:56:51 +0100] rev 5879
util_win32: make os_link more robust (issue 761)
On mapped drives, os_link() manages to create links but nlink() does not report them.
Matt Mackall <mpm@selenic.com> [Fri, 18 Jan 2008 10:48:25 -0600] rev 5878
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com> [Fri, 18 Jan 2008 10:07:36 -0600] rev 5877
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Jan 2008 00:16:20 +0100] rev 5876
convert: document the subversion conversion model
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Jan 2008 23:46:56 +0100] rev 5875
convert: fetch less revisions when looking for a branch parent
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Jan 2008 23:46:56 +0100] rev 5874
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Jan 2008 23:46:56 +0100] rev 5873
convert: make svn revision iterator interruptible
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Jan 2008 23:46:56 +0100] rev 5872
convert: fix cross-branches subversion revisions handling
The "one revision belongs to one branch" assumptions is relaxed. Branch
revisions are parsed down to the first branch copy encountered, older history
is skipped. It means the conversion is still not satisfying when dealing with
branches overwriting themselves. This issue already existed in the previous
version.
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Jan 2008 23:57:20 +0100] rev 5871
convert: fix parents of last fetched svn revision
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Jan 2008 23:46:56 +0100] rev 5870
convert: don't scan directories on property changes
Matt Mackall <mpm@selenic.com> [Fri, 18 Jan 2008 09:03:17 -0600] rev 5869
hooks: fix pre- and post- hooks specified in .hg/hgrc
We were looking up hooks in the wrong ui object. Also, we weren't
handling hooks to commands without a repo.
Nicholas Riley <njriley@uiuc.edu> [Fri, 18 Jan 2008 08:23:29 -0600] rev 5868
[PATCH] zsh_completion tag/mq fixes
Been using these for almost a month now without problems, so I figured
some other people might want them.
This allows the zsh completion to work with tags and mq patch names
containing spaces, and adds support for qgoto.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Fri, 18 Jan 2008 03:06:05 +0200] rev 5867
tests: Use /bin/sh for test-journal-exists, /bin/bash may not be available
Matt Mackall <mpm@selenic.com> [Thu, 17 Jan 2008 13:51:59 -0600] rev 5866
patchbomb: prompt only once for SMTP password
- simplify mail._sendmail to be a function rather than a class
- simplify connect to return a function rather than a class
- move exception handling from mail.sendmail to mail.connect
- use a single connection for all messages in patchbomb
Matt Mackall <mpm@selenic.com> [Wed, 16 Jan 2008 11:32:25 -0600] rev 5865
transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
Matt Mackall <mpm@selenic.com> [Wed, 16 Jan 2008 11:14:51 -0600] rev 5864
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 16 Jan 2008 11:14:24 -0600] rev 5863
diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Jan 2008 23:04:44 +0100] rev 5862
merge with main
Matt Mackall <mpm@selenic.com> [Tue, 15 Jan 2008 15:49:24 -0600] rev 5861
Merge with crew
Kostantinos Koukopoulos <kouk@noc.uoa.gr> [Tue, 15 Jan 2008 13:29:59 +0200] rev 5860
convert should use default value when CVS_RSH is not set, that value
being 'ssh'.
Patrick Mezard <pmezard@gmail.com> [Tue, 15 Jan 2008 13:46:32 +0100] rev 5859
hgk: display branch name in diff header
Giorgos Keramidas <keramida@ceid.upatras.gr> [Fri, 11 Jan 2008 23:30:56 +0200] rev 5858
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
Matt Mackall <mpm@selenic.com> [Mon, 14 Jan 2008 16:28:32 -0600] rev 5857
merge: add a bit more sanity to divergent copy checks
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 23:36:56 +0100] rev 5856
keyword: test that expansion is done filewise
Checks issue fixed in 2a66138c5e7e.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 14 Jan 2008 09:00:23 +0100] rev 5855
Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.
Edouard Gomez <ed.gomez@free.fr> [Sat, 05 Jan 2008 01:51:21 +0100] rev 5854
convert: separate trunk detection from branch layout detection
In some subversion repositories, trunk is present but no branches
are used. The current code is assuming that both trunk and branches
must exist before adding trunk's head to the heads list.
It's just better to separate the branch layout stuff from the trunk one.
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Jan 2008 20:49:07 +0100] rev 5853
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Jan 2008 19:35:11 +0100] rev 5852
patch: handle empty vs no file in git patches (issue906)
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Jan 2008 20:43:09 +0100] rev 5851
patch: remove CRLF when parsing file names
Brendan Cully <brendan@kublai.com> [Fri, 11 Jan 2008 18:33:10 -0800] rev 5850
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Fri, 11 Jan 2008 18:31:13 -0800] rev 5849
Document --base null in bundle help
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Jan 2008 16:51:54 -0800] rev 5848
Merge with mpm
Patrick Mezard <pmezard@gmail.com> [Fri, 11 Jan 2008 21:20:27 +0100] rev 5847
util_win32: implement posixfile_nt.writelines()
Used by the keyword extension.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Jan 2008 22:41:30 +0900] rev 5846
New extension to support problematic MBCS on Windows.
The aim of this extension is to clear the problem related to having
0x5c in 2nd byte of encoded bytes. So this extension is usefull for:
* Japanese Windows user shift_jis encoding.
* Chinese Windows user using big5 encoding.
To use this extension, simply enable it without any customization.
Note that some important python built-in functions and mercurial
functions are altered for this extension to convert argument if need
to handle MBCS.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Jan 2008 21:30:37 +0900] rev 5845
Fix not to use os.sep directly.
This change is intended for MBCS support.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Jan 2008 21:30:36 +0900] rev 5844
Add util.splitpath() and use it instead of using os.sep directly.
This change is intended to allow hooking splitpath() by win32mbcs
extension for MBCS support.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Jan 2008 21:30:35 +0900] rev 5843
Add endswithsep() and use it instead of using os.sep and os.altsep directly.
This change is intended to allow hooking endswithsep() by win32mbcs
extension for MBCS support.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Jan 2008 21:30:13 +0900] rev 5842
Use util.normpath() instead of direct path string operation.
This change is intended to allow hooking normpath() by win32mbcs
extension for MBCS support.
"Shun-ichi GOTO" <shunichi.goto@gmail.com> [Fri, 11 Jan 2008 14:06:05 -0600] rev 5841
svn: fix copy exception
Matt Mackall <mpm@selenic.com> [Fri, 11 Jan 2008 14:06:05 -0600] rev 5840
posixfile_nt: set closed early
Exceptions in __init__ may leave us with close undefined in __del__
Will Maier <willmaier@ml1.net> [Wed, 09 Jan 2008 10:00:18 -0600] rev 5839
Don't use the -i option with sed
This patch fixes test-keyword on platforms without GNU sed (like
OpenBSD).
Edouard Gomez <ed.gomez@free.fr> [Wed, 09 Jan 2008 00:27:33 +0100] rev 5838
convert: respect hg.tagsbranch setting
Jesse Glick <jesse.glick@sun.com> [Sat, 05 Jan 2008 15:35:46 -0500] rev 5837
Issue #880: Simple misspelling ('occured') in web error message.
mark.williamson@cl.cam.ac.uk [Fri, 11 Jan 2008 01:36:20 +0000] rev 5836
Tweak finddate to pass date directly.
Previous implementation was passing (date + "to" + date), which fails
when "<" and friends are prepended to the date specifier.
Signed-off-by: Mark Williamson <mark.williamson@cl.cam.ac.uk>
Michele Cella <michele.cella@gmail.com> [Wed, 09 Jan 2008 11:15:00 +0100] rev 5835
adding "prefix" option to "hg serve" (command line and [web] section)
allows "hg serve" to serve from a different path than '/' (server root)
Kevin Christen <kevin.christen@gmail.com> [Tue, 08 Jan 2008 21:12:30 -0600] rev 5834
Fix XHTML validation error on file diff page.
Replaces <div>, a block level element, with <span>, it's inline
counterpart, in <pre>, which is also an inline element.
Matt Mackall <mpm@selenic.com> [Fri, 11 Jan 2008 13:06:38 -0600] rev 5833
hook: redirect stdout to stderr for ssh and http servers
Maxim Dounin <mdounin@mdounin.ru> [Fri, 11 Jan 2008 06:07:43 +0300] rev 5832
convert: add commandline.xargs(), use it in svn_sink class
Introduce commandline.xargs() to limit argument list with respect
to ARG_MAX bytes. If no ARG_MAX information available - use POSIX
required minimum of 4096 bytes.
Under Windows, while actual argument list length is limited to 32k,
shells impose their own limits on command line length, down to 2047 bytes
for cmd.exe under Windows NT/2k and about 2500 bytes for older 4nt.exe.
See http://support.microsoft.com/kb/830473 for details about cmd.exe
limitations.
Since ARG_MAX is limit for argument list and environment, we reserve half
of it and one byte for environment variables. This way with default ARG_MAX
(4096 bytes) we get value 2047 bytes which is OK for Windows too.
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 15:01:29 +0100] rev 5831
keyword: fix some doc strings; update copyright
Kirill Smelkov <kirr@mns.spb.ru> [Thu, 10 Jan 2008 12:07:18 +0300] rev 5830
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
Kirill Smelkov <kirr@mns.spb.ru> [Thu, 10 Jan 2008 12:07:18 +0300] rev 5829
cmdutil.commit: extract 'addremove' from opts carefully
we are going to use cmdutil.commit for qrecord, and it's brother
qrefresh does not support addremove.
Kirill Smelkov <kirr@mns.spb.ru> [Thu, 10 Jan 2008 12:07:18 +0300] rev 5828
dispatch: allow extensions to provide setup code
we'll need this soon, when record extension will optionally depend
on mq early -- when preparing cmdtable.
Also, if accepted, ExtensionHowto wiki should be updated as well.
Kirill Smelkov <kirr@mns.spb.ru> [Thu, 10 Jan 2008 12:07:13 +0300] rev 5827
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
Kirill Smelkov <kirr@mns.spb.ru> [Thu, 10 Jan 2008 11:43:30 +0300] rev 5826
record: some docs
While studing record, I've written some docstrings and comments.
Hope they are useful.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 05:24:33 +0100] rev 5825
keyword: clean up quiet setting in kwdemo and adding of untracked kwfiles
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 11:21:40 +0100] rev 5824
keyword: suppress keyword expansion for log commands
With previous bugfix "hg log -p" expanded keywords.
Turn off again by making log, tip nokwcommands.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 05:18:50 +0100] rev 5823
keyword: (bugfix) only set changenode for kwtemplater when committing
kwexpand must always obtain changenode from filectx,
otherwise current changenode is expanded in every file.
Also fixes "hg cat <more than 1 file>".
Maxim Dounin <mdounin@mdounin.ru> [Tue, 08 Jan 2008 06:56:21 +0300] rev 5822
test-mq-header: don't fail with different patch(1)
At least under FreeBSD patch(1) won't fail on empty patch and will print
'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.
Matt Mackall <mpm@selenic.com> [Tue, 08 Jan 2008 15:56:12 -0600] rev 5821
Fix up tests for XHTML validation bits
Kevin Christen <kevin.christen@gmail.com> [Mon, 07 Jan 2008 21:29:40 -0600] rev 5820
Fixed numerous XHTML problems that caused validation errors and warnings.
Link elements for Atom and RSS feeds had no end tag. <div> block element
inside <a> in-line element isn't right and caused rendering problems on
Safari. Spurious </div> tag in search forms. Branch entry missing closing
</a> tag.
Dennis Schoen <ds@1d10t.de> [Mon, 31 Dec 2007 16:18:17 +0100] rev 5819
patchbomb: attachment options changed
'-a/--attach' send patches as attachment
'-i/--inline' sends patches as inline attachment (old behavior of -a/--attach)
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 16:11:01 +0100] rev 5818
patchbomb: consistently use opts.get
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 15:58:22 +0100] rev 5817
patchbomb: fix more line continuations (coding style)
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 18:22:39 +0100] rev 5816
keyword: add test
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 18:22:09 +0100] rev 5815
Add extension for filewise RCS-keyword expansion in working dir
- keywords are only expanded working dir, not in change history
- completely customizable keywords/expansions based on hg templates
- intrusiveness/slowdown can be reduced by specifying precise [keyword]
file patterns
- can be turned off/on anytime
- changesets can be exchanged regardless of remote/local keyword settings
Alexandre Vassalotti <mercurial-bugs@selenic.com> [Mon, 07 Jan 2008 15:26:12 -0600] rev 5814
restore branch after rollback (issue 902)
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Jan 2008 15:40:32 +0100] rev 5813
context: fix filectx.parents() bug introduced when editing 180a3eee4b75
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 06 Jan 2008 13:17:10 +0100] rev 5812
merge with crew-stable
Maxim Dounin <mdounin@mdounin.ru> [Sat, 29 Dec 2007 17:11:48 +0300] rev 5811
Fix copies reporting in log and convert.
If copy logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.
This fixes extra copies reported when executable bit was changed for
previously copied file.
Maxim Dounin <mdounin@mdounin.ru> [Sat, 29 Dec 2007 16:57:43 +0300] rev 5810
context: preserve changeset in filectx if we have one
If we know original changeset we are working with - try hard to
preserve it. Fallback to filelog.linkrev() only if we have no way
to get original changeset, since linkrev() may point to other
changeset.
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Jan 2008 17:36:16 +0100] rev 5809
test-convert-hg-svn: make it more windows friendly
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Jan 2008 17:36:16 +0100] rev 5808
test-convert-svn-sink: wrap repetitive svn checks in a function
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Jan 2008 22:52:28 +0100] rev 5807
Merge with crew-stable
Shun-ichi GOTO <shunichi.goto@gmail.com> [Sat, 05 Jan 2008 11:46:00 +0900] rev 5806
convert: Fix bug of limit_arglist() loosing file on limit boundary.
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:43:55 +0100] rev 5805
test-convert: test before() and after() conversion actions
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:43:55 +0100] rev 5804
test-convert-svn-source: test convert/multiple extra fields
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:43:49 +0100] rev 5803
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Fri, 04 Jan 2008 13:56:31 -0800] rev 5802
util: drop params added during experimentation
John Coomes <john.coomes@sun.com> [Tue, 18 Dec 2007 12:45:30 -0800] rev 5801
hg tag: run tag hook just once
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Jan 2008 17:55:16 +0100] rev 5800
Make run-tests.py --interactive work on Windows
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:23:47 +0100] rev 5799
convert: filemap must call base converter before()/after() actions
Bryan O'Sullivan <bos@serpentine.com> [Fri, 04 Jan 2008 11:58:27 -0800] rev 5798
fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com> [Fri, 04 Jan 2008 11:52:24 -0800] rev 5797
serve: Don't change directory in the child if invoked with -d and --cwd
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 04 Jan 2008 14:25:04 +0100] rev 5796
Fix status char in color extension for deleted (missing) files.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 04 Jan 2008 07:44:07 +0100] rev 5795
merge with main
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 03 Jan 2008 06:25:30 +0900] rev 5794
convert: print commit log message with local encoding correctly.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 03 Jan 2008 06:25:30 +0900] rev 5793
convert: Accept local path on win32.
Kevin Christen <kevin.christen@gmail.com> [Thu, 03 Jan 2008 20:27:32 -0600] rev 5792
color extension: change from GPL3 to 2
Matt Mackall <mpm@selenic.com> [Thu, 03 Jan 2008 13:46:39 -0600] rev 5791
changelog: fix decoding of extra
(spotted by pmezard)