Thu, 07 Feb 2008 12:31:29 +0100 convert: do not skip some lines in gnu arch summaries
Aleix Conchillo Flaque <aleix@member.fsf.org> [Thu, 07 Feb 2008 12:31:29 +0100] rev 6044
convert: do not skip some lines in gnu arch summaries
Wed, 06 Feb 2008 20:00:35 -0800 Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 06 Feb 2008 20:00:35 -0800] rev 6043
Merge with crew
Wed, 06 Feb 2008 19:57:52 -0800 Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 06 Feb 2008 19:57:52 -0800] rev 6042
Merge with crew
Thu, 26 Jul 2007 07:56:27 -0400 mq.py: add -U option to hg qdiff command
jorendorff@mozilla.com [Thu, 26 Jul 2007 07:56:27 -0400] rev 6041
mq.py: add -U option to hg qdiff command
Thu, 26 Jul 2007 07:56:04 -0400 commands.py, patch.py: add -U option to hg diff command
jorendorff@mozilla.com [Thu, 26 Jul 2007 07:56:04 -0400] rev 6040
commands.py, patch.py: add -U option to hg diff command
Thu, 07 Feb 2008 00:41:30 +0100 Update help output of test-convert for GNU arch entry.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Feb 2008 00:41:30 +0100] rev 6039
Update help output of test-convert for GNU arch entry.
Wed, 06 Feb 2008 23:24:15 +0100 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Feb 2008 23:24:15 +0100] rev 6038
Merge with crew-stable
Wed, 06 Feb 2008 11:42:04 +0100 convert: add full description for gnu arch revisions
Aleix Conchillo Flaque <aleix@member.fsf.org> [Wed, 06 Feb 2008 11:42:04 +0100] rev 6037
convert: add full description for gnu arch revisions
Wed, 06 Feb 2008 09:11:36 +0100 merge with main
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Feb 2008 09:11:36 +0100] rev 6036
merge with main
Tue, 05 Feb 2008 09:30:08 +0100 convert: added GNU Arch source converter
Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 05 Feb 2008 09:30:08 +0100] rev 6035
convert: added GNU Arch source converter
Fri, 08 Feb 2008 18:07:55 -0200 qinit -c: add ^\.hg and ^\.mq to .hgignore
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6034
qinit -c: add ^\.hg and ^\.mq to .hgignore
Fri, 08 Feb 2008 18:07:55 -0200 dirstate.status: avoid putting ignored files in the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6033
dirstate.status: avoid putting ignored files in the unknown list If list_ignored was false, we would blindly add files not in the dirstate to the unknown list. This should finish fixing issue886.
Fri, 08 Feb 2008 18:07:55 -0200 dirstate: don't walk ignored directories
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6032
dirstate: don't walk ignored directories With a pattern like '^directory$' in .hgignore, a "hg status directory" would still walk "directory" and all its subdirs. This is the first half of a fix for issue886.
Fri, 08 Feb 2008 18:07:55 -0200 revert: don't assume ignored files will be returned in the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6031
revert: don't assume ignored files will be returned in the unknown list That's just an artifact of the current implementation, and I'll change that soon. Bonus points: - we don't care about the unknown list at all - we don't print an extra message if we try to revert a removed file that is not present in the target revision
Fri, 08 Feb 2008 18:07:55 -0200 revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6030
revert: revert clean files when only a change of flags is needed
Fri, 08 Feb 2008 18:07:55 -0200 Revert e82dd2dd6276
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6029
Revert e82dd2dd6276 Those files are supposed to be HTML 4.01, not XML.
Fri, 08 Feb 2008 11:50:37 +0100 make static-http work with empty repos (issue965)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 08 Feb 2008 11:50:37 +0100] rev 6028
make static-http work with empty repos (issue965)
Wed, 06 Feb 2008 23:09:13 +0100 mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Feb 2008 23:09:13 +0100] rev 6027
mq: qimport must read patches in binary mode
Tue, 05 Feb 2008 16:09:21 -0600 keyword: fix my string pasting thinko
Matt Mackall <mpm@selenic.com> [Tue, 05 Feb 2008 16:09:21 -0600] rev 6026
keyword: fix my string pasting thinko Spotted by Maxim Dounin
Mon, 04 Feb 2008 19:38:34 -0600 filemerge: wrap quotes around tool path
Steve Borho <steve@borho.org> [Mon, 04 Feb 2008 19:38:34 -0600] rev 6025
filemerge: wrap quotes around tool path
Mon, 04 Feb 2008 21:08:45 +0100 keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 21:08:45 +0100] rev 6024
keyword: nokwcommands, restricted string variables at top level - prettier syntax conforming eg. to commands.norepo - possibly easier to hook from outside
Mon, 04 Feb 2008 18:27:36 +0100 keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6023
keyword: split line continuation in 2 steps (style)
Mon, 04 Feb 2008 18:27:36 +0100 keyword: add empty_ok argument to kwrepo.commit
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6022
keyword: add empty_ok argument to kwrepo.commit
Mon, 04 Feb 2008 18:27:36 +0100 keyword: allow keyword expansion on clone
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6021
keyword: allow keyword expansion on clone If [keyword] filename patterns are specified in a global hgrc keywords will be expanded in clone. This behaviour is more consistent but also more dangerous. Specifying global, and thus more complicted, [keyword] patterns might slow things down as well. Mention this in help?
Tue, 05 Feb 2008 15:59:10 +0100 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 15:59:10 +0100] rev 6020
merge with crew-stable
Tue, 05 Feb 2008 15:54:42 +0100 cleanly abort on unknown archive type (issue966)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 15:54:42 +0100] rev 6019
cleanly abort on unknown archive type (issue966)
Tue, 05 Feb 2008 14:34:46 +0100 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 14:34:46 +0100] rev 6018
merge with crew-stable
Tue, 05 Feb 2008 14:02:03 +0100 hgweb: fix search skipping tip
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 14:02:03 +0100] rev 6017
hgweb: fix search skipping tip
Mon, 04 Feb 2008 09:56:01 -0600 filemerge: fix pattern matching
dhruva <dhruvakm@gmail.com> [Mon, 04 Feb 2008 09:56:01 -0600] rev 6016
filemerge: fix pattern matching
Sun, 03 Feb 2008 23:58:02 -0800 filemerge: fix path to working file when fixeol is enabled
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:58:02 -0800] rev 6015
filemerge: fix path to working file when fixeol is enabled
Mon, 04 Feb 2008 09:53:10 -0600 mergetools: correct vim typo
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:53:10 -0600] rev 6014
mergetools: correct vim typo
Mon, 04 Feb 2008 09:51:56 -0600 filemerge: handle missing regappend
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:51:56 -0600] rev 6013
filemerge: handle missing regappend
Sun, 03 Feb 2008 23:08:16 -0800 util_win32: add missing valname param to query_val function
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
Sun, 03 Feb 2008 22:27:53 -0600 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org> [Sun, 03 Feb 2008 22:27:53 -0600] rev 6011
filemerge: two fixes for kdiff3 example configuration
Thu, 31 Jan 2008 22:32:11 -0600 add merge sections to hgrc.5
Steve Borho <steve@borho.org> [Thu, 31 Jan 2008 22:32:11 -0600] rev 6010
add merge sections to hgrc.5
Sun, 03 Feb 2008 19:29:05 -0600 filemerge: remove the hgmerge script
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.
Sun, 03 Feb 2008 19:29:05 -0600 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 6008
filemerge: add an example set of global settings for common merge tools
Sun, 03 Feb 2008 19:29:05 -0600 filemerge: add config item for GUI 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
Sun, 03 Feb 2008 19:29:05 -0600 merge: add registry look up bits to tool search
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6006
merge: add registry look up bits to tool search
Sun, 03 Feb 2008 19:29:05 -0600 merge: add support for tool EOL fixups
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
Sun, 03 Feb 2008 19:29:05 -0600 merge: allow smarter tool configuration
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
Sun, 03 Feb 2008 19:29:05 -0600 filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6003
filemerge: pull file-merging code into its own module
Sun, 03 Feb 2008 19:29:05 -0600 merge: move the bulk of simplemerge into core
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
Sun, 03 Feb 2008 21:47:07 -0200 merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:47:07 -0200] rev 6001
merge with crew-stable
Sat, 02 Feb 2008 21:01:43 +0100 test-serve: wait before killing to always hide the "killed!" message.
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.
Sat, 02 Feb 2008 14:55:14 +0100 Mention 'hg update' to switch branches in help for branch and branches.
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.
Sat, 02 Feb 2008 14:49:31 +0100 Clarify help for hg status and make it consistent.
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.
Fri, 01 Feb 2008 13:31:46 -0800 profile: expand PID in output file name
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:31:46 -0800] rev 5997
profile: expand PID in output file name
Fri, 01 Feb 2008 13:11:03 -0800 convert: allow synthetic history to be spliced in.
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.
Fri, 01 Feb 2008 13:09:45 -0800 profiling: allow CGI and FastCGI to be profiled
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:09:45 -0800] rev 5995
profiling: allow CGI and FastCGI to be profiled
Fri, 01 Feb 2008 10:31:15 +0100 update copyright notice in version output
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 01 Feb 2008 10:31:15 +0100] rev 5994
update copyright notice in version output
Fri, 01 Feb 2008 10:31:13 +0100 hgweb: explicit response status
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 01 Feb 2008 10:31:13 +0100] rev 5993
hgweb: explicit response status
Fri, 01 Feb 2008 10:31:09 +0100 updating lsprof.py from remote repository
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 01 Feb 2008 10:31:09 +0100] rev 5992
updating lsprof.py from remote repository
Thu, 31 Jan 2008 13:57:48 +0100 highlight: update according to latest hgweb_mod changes
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.
Fri, 01 Feb 2008 00:25:32 +0100 Fixed typo: Gnerating -> Generating
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Feb 2008 00:25:32 +0100] rev 5990
Fixed typo: Gnerating -> Generating
Thu, 31 Jan 2008 23:42:21 +0100 added \r for progress counting in churn extension
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
(0) -3000 -1000 -300 -100 -56 +56 +100 +300 +1000 +3000 +10000 +30000 tip